Updated mapping Eiffel to JSON

 SpreadSheet.properties done.
 SpreadSheet.spreadSheetTheme wip.

Author: jvelilla

sheets/src/json/eg_sheets_json.e

@@ -140,11 +140,59 @@ feature {NONE} -- JSON To Eiffel
 			if attached {JSON_OBJECT} json_value (a_json, "iterativeCalculationSettings") as  iterativeCalculationSettings then
 				-- Result.set_iterative_calculation_settings (a_iterative_calculation_settings: [like iterative_calculation_settings] detachable EG_ITERATIVE_CALCULATION_SETTINGS)
 			end
-			if attached {JSON_OBJECT} json_value (a_json, "spreadsheetTheme") as  spreadsheetTheme then
-				-- Result.set_spreadsheet_theme (a_theme: [like spreadsheet_theme] detachable EG_SPREADSHEET_THEME)
+			if attached {JSON_OBJECT} json_value (a_json, "spreadsheetTheme") as l_spreadsheet then
+				Result.set_spreadsheet_theme (spreadsheet_theme (l_spreadsheet))
 			end
 		end
 
+	spreadsheet_theme (a_json: JSON_VALUE): EG_SPREADSHEET_THEME
+			-- Create an object `EG_SPREADSHEET_THEME` from a json representation `a_json`.
+		do
+			create Result
+			if attached string_value_from_json (a_json, "primaryFontFamily") as l_primary_font then
+				Result.set_primary_font_family (l_primary_font)
+			end
+			if attached {JSON_ARRAY} json_value (a_json, "themeColors") as l_theme_colors then
+				across l_theme_colors as ic  loop
+					Result.force_theme_color (theme_color_pair (ic.item))
+				end
+			end
+		end
+
+	theme_color_pair (a_json: JSON_VALUE): EG_THEME_COLOR_PAIR
+		local
+			l_tc: EG_THEME_COLOR
+		do
+			create Result
+			if attached string_value_from_json (a_json, "colorType") as l_color_type then
+				create l_tc
+				if l_color_type.is_case_insensitive_equal ("TEXT") then
+					l_tc.set_text
+				elseif l_color_type.is_case_insensitive_equal ("BACKGROUND") then
+					l_tc.set_background
+				elseif l_color_type.is_case_insensitive_equal ("ACCENT1") then
+					l_tc.set_accent1
+				elseif l_color_type.is_case_insensitive_equal ("ACCENT2") then
+					l_tc.set_accent2
+				elseif l_color_type.is_case_insensitive_equal ("ACCENT3") then
+					l_tc.set_accent3
+				elseif l_color_type.is_case_insensitive_equal ("ACCENT4") then
+					l_tc.set_accent4
+				elseif l_color_type.is_case_insensitive_equal ("ACCENT5") then
+					l_tc.set_accent5
+				elseif l_color_type.is_case_insensitive_equal ("ACCENT6") then
+					l_tc.set_accent6
+				elseif l_color_type.is_case_insensitive_equal ("LINK") then
+					l_tc.set_link
+				end
+				Result.set_color_type (l_tc)
+			end
+			if attached {JSON_OBJECT} json_value (a_json, "color") as l_color  then
+				Result.set_color (eg_color_style (l_color))
+			end
+
+		end
+
 	cell_format (a_json: JSON_OBJECT): EG_CELL_FORMAT
 			-- Create an object `EG_CELL_FORMAT` from a json representation `a_json`
 		local
@@ -251,24 +299,16 @@ feature {NONE} -- JSON To Eiffel
 			-- Create an object `EG_COLOR` from a json rerpesentation `a_json`.
 		do
 			create Result
-			if attached integer_value_from_json (a_json, "red") as l_val then
-				Result.set_red (l_val)
-			elseif attached real_value_from_json (a_json, "red") as l_val then
+			if attached real_value_from_json (a_json, "red") as l_val then
 				Result.set_red (l_val)
 			end
-			if attached integer_value_from_json (a_json, "green") as l_val then
-				Result.set_green (l_val)
-			elseif attached real_value_from_json (a_json, "green") as l_val then
+			if attached real_value_from_json (a_json, "green") as l_val then
 				Result.set_green (l_val)
 			end
-			if attached integer_value_from_json (a_json, "blue") as l_val then
-				Result.set_blue (l_val)
-			elseif attached real_value_from_json (a_json, "blue") as l_val then
+			if attached real_value_from_json (a_json, "blue") as l_val then
 				Result.set_blue (l_val)
 			end
-			if attached integer_value_from_json (a_json, "alpha") as l_val then
-				Result.set_alpha (l_val)
-			elseif attached real_value_from_json (a_json, "alpha") as l_val then
+			if attached real_value_from_json (a_json, "alpha") as l_val then
 				Result.set_alpha (l_val)
 			end
 		end

sheets/src/objects/eg_cell_format.e

@@ -215,9 +215,6 @@ feature -- Eiffel to JSON
 			if attached background_color as l_bg then
 				Result.put (l_bg.to_json, "backgroundColor")
 			end
-			if attached background_color_style as l_bgs then
-				Result.put (l_bgs.to_json, "backgroundColorStyle")
-			end
 			if attached borders as lb then
 				Result.put (lb.to_json, "borders")
 			end
@@ -239,6 +236,9 @@ feature -- Eiffel to JSON
 			if attached text_format as l_tf then
 				Result.put (l_tf.to_json, "textFormat")
 			end
+			if attached background_color_style as l_bgs then
+				Result.put (l_bgs.to_json, "backgroundColorStyle")
+			end
 			if attached hyperlink_display_type as l_hyper then
 				Result.put (l_hyper.to_json, "hyperlinkDisplayType")
 			end

sheets/src/objects/eg_color.e

@@ -8,7 +8,7 @@ note
 	  "green": number,
 	  "blue": number,
 	  "alpha": number
-	}	
+	}
 
 	]"
 	date: "$Date$"
@@ -76,7 +76,7 @@ feature -- Eiffel to JSON
 			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 (green), "blue")
+			Result.put (create {JSON_NUMBER}.make_real (blue), "blue")
 			Result.put (create {JSON_NUMBER}.make_real (alpha), "alpha")
 		end
 

sheets/src/objects/eg_color_style.e

@@ -58,7 +58,7 @@ feature -- Eiffel to JSON
 		do
 			create Result.make_empty
 			if attached rgb_color as l_rgb_color then
-
+				Result.put (l_rgb_color.to_json, "rgbColor")
 			end
 			if attached theme_color as l_theme_color then
 				Result.put (l_theme_color.to_json, "themeColor")

sheets/src/objects/eg_spreadsheet_theme.e

@@ -18,56 +18,66 @@ note
 class
 	EG_SPREADSHEET_THEME
 
-inherit
-
-	ANY
-		redefine
-			default_create
-		end
-
-create
-	default_create
-
-feature {NONE} --Initialize
-
-	default_create
-		do
-			create primary_font_family.make_empty
-			create {ARRAYED_LIST[EG_THEME_COLOR_PAIR]}theme_colors.make (0)
-		end
-
 feature -- Access
 
-
-	primary_font_family: STRING
+	primary_font_family: detachable STRING
 		 -- Name of the primary font family.
 
-	theme_colors: LIST [EG_THEME_COLOR_PAIR]
+	theme_colors: detachable LIST [EG_THEME_COLOR_PAIR]
 		-- The spreadsheet theme color pairs.
 		-- To update you must provide all theme color pairs.
 
 feature -- Change Element
 
-	set_primary_font_family (a_value: STRING)
+	set_primary_font_family (a_value: like primary_font_family)
 		do
 			primary_font_family := a_value
 		ensure
 			primary_font_family_set: primary_font_family = a_value
 		end
 
 	force_theme_color (a_color: EG_THEME_COLOR_PAIR)
+		local
+			l_theme_colors: like theme_colors
 		do
-			theme_colors.force (a_color)
+			l_theme_colors := theme_colors
+			if l_theme_colors /= Void then
+				l_theme_colors.force (a_color)
+			else
+				create {ARRAYED_LIST[EG_THEME_COLOR_PAIR]} l_theme_colors.make (2)
+				l_theme_colors.force (a_color)
+			end
+			theme_colors := l_theme_colors
+		end
+
+	set_theme_colors (a_colors: like theme_colors)
+			-- Set the list `theme_colors` with `a_colors`.
+		do
+			theme_colors := a_colors
+		ensure
+			theme_colors_set: theme_colors = a_colors
 		end
 
 
 feature -- Eiffel to JSON
 
 	to_json: JSON_OBJECT
 			-- Json representation of current object
+		local
+			j_array: JSON_ARRAY
 		do
 			create Result.make_with_capacity (1)
-			Result.put (create {JSON_STRING}.make_from_string (primary_font_family), "primaryFontFamily")
+			if attached primary_font_family as lf then
+				Result.put (create {JSON_STRING}.make_from_string (lf), "primaryFontFamily")
+			end
+			if attached theme_colors as l_colors then
+				create j_array.make (l_colors.count)
+				across l_colors as ic loop
+					j_array.add (ic.item.to_json)
+				end
+				Result.put (j_array, "themeColors" )
+			end
+
 			-- theme_colors JSON_ARRAY
 		end
 end

sheets/src/objects/eg_text_format.e

@@ -144,8 +144,37 @@ feature -- Change Element
 feature -- Eiffel to JSON
 
 	to_json: JSON_OBJECT
+			-- JSON representation of current object
+			--		{
+			--		  "foregroundColor": {
+			--		    object (Color)
+			--		  },
+			--		  "foregroundColorStyle": {
+			--		    object (ColorStyle)
+			--		  },
+			--		  "fontFamily": string,
+			--		  "fontSize": integer,
+			--		  "bold": boolean,
+			--		  "italic": boolean,
+			--		  "strikethrough": boolean,
+			--		  "underline": boolean
+			--		}
+
 		do
 			create Result.make_empty
-			-- TODO
+			if attached foreground_color as l_color then
+				Result.put (l_color.to_json, "foregroundColor")
+			end
+			if attached foreground_color_style as l_fg_color then
+				Result.put (l_fg_color.to_json, "foregroundColorStyle")
+			end
+			if attached font_family as l_font_family then
+				Result.put (create {JSON_STRING}.make_from_string (l_font_family), "fontFamily")
+			end
+			Result.put (create {JSON_NUMBER}.make_integer (font_size),"fontSize")
+			Result.put (create {JSON_BOOLEAN}.make (bold),"bold")
+			Result.put (create {JSON_BOOLEAN}.make (italic),"italic")
+			Result.put (create {JSON_BOOLEAN}.make (strikethrough),"strikethrough")
+			Result.put (create {JSON_BOOLEAN}.make (underline),"underline")
 		end
 end

sheets/src/objects/eg_theme_color.e

@@ -67,7 +67,7 @@ feature {NONE} -- Initialization
 	accent6: INTEGER = 9
 			-- Represents the sixth accent color.
 
-	link: INTEGER = 19
+	link: INTEGER = 10
 			-- Represents the color to use for hyperlinks.
 
 feature -- Change Elements
@@ -193,7 +193,7 @@ feature -- Status Report
 			          a_value = accent3 or else
 			          a_value = accent4 or else
 			          a_value = accent5 or else
-			          a_value = accent5 or else
+			          a_value = accent6 or else
 			          a_value = link
 		end
 

sheets/src/objects/eg_theme_color_pair.e

@@ -16,50 +16,45 @@ note
 class
 	EG_THEME_COLOR_PAIR
 
-inherit
-
-	ANY
-		redefine
-			default_create
-		end
-
-create
-	default_create
-
-feature {NONE} -- Initialization
-
-	default_create
-		do
-			create color_type
-			create color
-		end
 
 feature -- Access
 
-	color_type: EG_THEME_COLOR
+	color_type: detachable EG_THEME_COLOR
 			-- The type of the spreadsheet theme color.
 
 
-	color: EG_COLOR_STYLE
+	color: detachable EG_COLOR_STYLE
 			-- the concrete color corresponding to the theme color type.
 
 feature -- Element Change
 
 	set_color_type (a_type: like color_type)
+			-- Set `color_type` with `a_type`
 		do
 			color_type := a_type
+		ensure
+			color_type_set: color_type = a_type
 		end
 
 	set_color (a_color: like color)
+			-- Set `color` with `a_color`
 		do
-			color := color
+			color := a_color
+		ensure
+			color_set: color = a_color
 		end
 
 feature -- Eiffel to JSON
 
 	to_json: JSON_OBJECT
 		do
 			create Result.make_empty
-			Result.put (color_type.to_json, "colorType")
+			if attached color_type as l_type then
+				Result.put (l_type.to_json, "colorType")
+			end
+			if attached color as l_color then
+				Result.put (l_color.to_json, "color")
+			end
+
 		end
 end