Updated EG_COLOR class to define if we have a default setting.

Updated Eiffel to JSON mapping.

Author: jvelilla

sheets/src/json/eg_sheets_json.e

@@ -299,17 +299,19 @@ feature {NONE} -- JSON To Eiffel
 			-- Create an object `EG_COLOR` from a json rerpesentation `a_json`.
 		do
 			create Result
-			if attached real_value_from_json (a_json, "red") as l_val then
-				Result.set_red (l_val)
-			end
-			if attached real_value_from_json (a_json, "green") as l_val then
-				Result.set_green (l_val)
-			end
-			if attached real_value_from_json (a_json, "blue") as l_val then
-				Result.set_blue (l_val)
-			end
-			if attached real_value_from_json (a_json, "alpha") as l_val then
-				Result.set_alpha (l_val)
+			if not a_json.is_empty then
+				if attached color_value_from_json (a_json, "red") as l_val then
+					Result.set_red (l_val)
+				end
+				if attached color_value_from_json (a_json, "green") as l_val then
+					Result.set_green (l_val)
+				end
+				if attached color_value_from_json (a_json, "blue") as l_val then
+					Result.set_blue (l_val)
+				end
+				if attached color_value_from_json (a_json, "alpha") as l_val then
+					Result.set_alpha (l_val)
+				end
 			end
 		end
 
@@ -638,6 +640,21 @@ feature {NONE} -- Implementation
 			end
 		end
 
+	color_value_from_json (a_json_data: detachable JSON_VALUE; a_id: STRING): REAL
+		do
+			if
+				attached {JSON_NUMBER} json_value (a_json_data, a_id) as v and then
+				v.numeric_type = v.real_type
+			then
+				Result := v.item.to_real
+			elseif attached {JSON_NUMBER} json_value (a_json_data, a_id) as v and then
+				v.numeric_type = v.integer_type
+			then
+				Result := v.item.to_integer
+			end
+
+		end
+
 	integer_value_from_json (a_json_data: detachable JSON_VALUE; a_id: STRING): INTEGER
 		do
 			if

sheets/src/objects/eg_color.e

@@ -18,6 +18,22 @@ note
 class
 	EG_COLOR
 
+inherit
+
+	ANY
+		redefine
+			default_create
+		end
+
+create
+	default_create
+
+feature {NONE} -- Initialization
+
+	default_create
+		do
+			is_default := True
+		end
 
 feature -- Access
 
@@ -37,47 +53,73 @@ feature -- Access
 			-- This uses a wrapper message rather than a simple float scalar so that it is possible to distinguish between a default value and the value being unset.
 			-- If omitted, this color object is to be rendered as a solid color (as if the alpha value had been explicitly given with a value of 1.0). 		
 
+	is_default: BOOLEAN
+			-- Are the attributes in default values?
+
 
 feature -- Element Change
 
 	set_red (a_val: REAL)
+			-- Set `red` to `a_val`.
 		do
+			is_default := False
 			red := a_val
 		ensure
+			not_default: not is_default
 			red_set: red = a_val
 		end
 
 	set_green (a_val: REAL)
 		do
+			is_default := False
 			green := a_val
 		ensure
+			not_default: not is_default
 			green_set: green = a_val
 		end
 
 	set_blue (a_val: REAL)
 		do
+			is_default := False
 			blue := a_val
 		ensure
+			not_default: not is_default
 			blue_set: blue = a_val
 		end
 
 	set_alpha (a_val: REAL)
 		do
+			is_default := False
 			alpha := a_val
 		ensure
+			not_default: not is_default
 			alpha_set: alpha = a_val
 		end
 
+	reset
+			-- Reset the attributes to default values.
+		do
+			is_default := True
+			red := 0
+			green := 0
+			blue := 0
+			alpha := 0
+		end
+
 feature -- Eiffel to JSON
 
 	to_json: JSON_OBJECT
 			-- Json representation of current object.
 		do
-			create Result.make_with_capacity (4)
-			Result.put (create {JSON_NUMBER}.make_real (red), "red")
-			Result.put (create {JSON_NUMBER}.make_real (green), "green")
-			Result.put (create {JSON_NUMBER}.make_real (blue), "blue")
-			Result.put (create {JSON_NUMBER}.make_real (alpha), "alpha")
+			if is_default then
+				create Result.make
+			else
+				create Result.make_with_capacity (4)
+				Result.put (create {JSON_NUMBER}.make_real (red), "red")
+				Result.put (create {JSON_NUMBER}.make_real (green), "green")
+				Result.put (create {JSON_NUMBER}.make_real (blue), "blue")
+				Result.put (create {JSON_NUMBER}.make_real (alpha), "alpha")
+			end
 		end
 
 invariant