Updated EG_SPREADSHEET_PROPERTIES class

defined all the attributes as detachable, and update to_json feature.

Author: jvelilla

sheets/src/json/eg_sheets_json.e

@@ -111,6 +111,7 @@ feature {NONE} -- JSON To Eiffel
 			-- Create an object `EG_SPREADSHEET_PROPERTIES` from a json representation `a_json`.
 		local
 			l_cell_format: EG_CELL_FORMAT
+			l_ri: EG_RECALCULATION_INTERVAL
 		do
 			create Result
 			if attached string_value_from_json (a_json, "title") as l_title then
@@ -120,13 +121,15 @@ feature {NONE} -- JSON To Eiffel
 				Result.set_locale (l_locale)
 			end
 			if attached string_value_from_json (a_json, "autoRecalc") as l_auto_recalc then
+				create l_ri
 				if l_auto_recalc.is_case_insensitive_equal ("ON_CHANGE") then
-					Result.auto_recalc.set_on_change
+					l_ri.set_on_change
 				elseif l_auto_recalc.is_case_insensitive_equal ("MINUTE") then
-					Result.auto_recalc.set_minute
+					l_ri.set_minute
 				elseif l_auto_recalc.is_case_insensitive_equal ("HOUR") then
-					Result.auto_recalc.set_hour
+					l_ri.set_hour
 				end
+				Result.set_auto_recalc (l_ri)
 			end
 			if attached string_value_from_json (a_json, "timeZone") as l_time_zone then
 				Result.set_time_zone (l_time_zone)

sheets/src/objects/eg_spreadsheet_properties.e

@@ -27,129 +27,119 @@ note
 class
 	EG_SPREADSHEET_PROPERTIES
 
-inherit
-	ANY
-		redefine
-			default_create
-		end
-create
-	default_create
-
-feature {NONE} -- Initialization
-
-	default_create
-		do
-			create title.make_empty
-			create locale.make_empty
-			create auto_recalc
-			create time_zone.make_empty
-			create default_format
-			create spreadsheet_theme
-			create iterative_calculation_settings
-		end
 
 feature -- Access
 
-	title: STRING
+	title: detachable STRING
 			--  The title of the spreadsheet.
 
-	locale: STRING
+	locale: detachable STRING
 			-- The locale of the spreadsheet in one of the following formats:
 			--    an ISO 639-1 language code such as en
 			--    an ISO 639-2 language code such as fil, if no 639-1 code exists
 			--    a combination of the ISO language code and country code, such as en_US
 			-- Note: when updating this field, not all locales/languages are supported.
 
-	auto_recalc: EG_RECALCULATION_INTERVAL
+	auto_recalc: detachable EG_RECALCULATION_INTERVAL
 			-- The amount of time to wait before volatile functions are recalculated.
 
-	time_zone: STRING
+	time_zone: detachable STRING
 			-- The time zone of the spreadsheet, in CLDR format such as America/New_York.
 			-- If the time zone isn't recognized, this may be a custom time zone such as GMT-07:00.
 
-	default_format: EG_CELL_FORMAT
+	default_format: detachable EG_CELL_FORMAT
 			-- The default format of all cells in the spreadsheet.
 			-- CellData.effectiveFormat will not be set if the cell's format is equal to this default format. This field is read-only.
 
 	iterative_calculation_settings: detachable EG_ITERATIVE_CALCULATION_SETTINGS
 			-- Determines whether and how circular references are resolved with iterative calculation.
 			-- Absence of this field means that circular references result in calculation errors.
 
-	spreadsheet_theme: EG_SPREADSHEET_THEME
+	spreadsheet_theme: detachable EG_SPREADSHEET_THEME
 			-- theme applied to the spreadsheet.
 
 feature -- Element Change
 
-	set_title (a_title: STRING)
+	set_title (a_title: like title)
 			-- Set `title` with `a_title`.
 		do
 			title := a_title
 		ensure
 			title_set: title = a_title
 		end
 
-	set_locale (a_locale: STRING)
+	set_locale (a_locale: like locale)
 			-- Set `locale` with `a_locale`.
 		do
 			locale := a_locale
 		ensure
 			locale_set: locale = a_locale
 		end
 
-	set_time_zone (a_time_zone: STRING)
+	set_time_zone (a_time_zone: like time_zone)
 			-- Set `time_zone` with `a_time_zone`
 		do
 			time_zone := a_time_zone
+		ensure
+			time_zone_set: time_zone = a_time_zone
 		end
 
-	set_default_format (a_format: EG_CELL_FORMAT)
+	set_default_format (a_format: like default_format)
 			-- Set `default_format` with `format`.
 		do
 			default_format := a_format
+		ensure
+			default_format_set: default_format = a_format
 		end
 
 	set_iterative_calculation_settings (a_iterative_calculation_settings: like iterative_calculation_settings)
 			-- Set `iterative_calculation_settings` with `a_iterative_calculation_settings`.
 		do
 			iterative_calculation_settings := a_iterative_calculation_settings
+		ensure
+			iterative_calculation_settings_set: iterative_calculation_settings = a_iterative_calculation_settings
 		end
 
-	set_spreadsheet_theme (a_theme: EG_SPREADSHEET_THEME)
+	set_spreadsheet_theme (a_theme: like spreadsheet_theme)
 		do
 			spreadsheet_theme := a_theme
+		ensure
+			spreadsheet_theme_set: spreadsheet_theme = a_theme
+		end
+
+	set_auto_recalc (a_auto_recalc: like auto_recalc)
+			-- Set auto_recalc with `a_auto_recalc`.
+		do
+			auto_recalc := a_auto_recalc
+		ensure
+			auto_recalc_set: auto_recalc = a_auto_recalc
 		end
 
+
 feature -- Eiffel to JSON
 
 	to_json: JSON_OBJECT
 			-- Json representation of the current object
-			--		{
-			--		  "title": string,
-			--		  "locale": string,
-			--		  "autoRecalc": enum (RecalculationInterval),
-			--		  "timeZone": string,
-			--		  "defaultFormat": {
-			--		    object (CellFormat)
-			--		  },
-			--		  "iterativeCalculationSettings": {
-			--		    object (IterativeCalculationSettings)
-			--		  },
-			--		  "spreadsheetTheme": {
-			--		    object (SpreadsheetTheme)
-			--		  }
-			--		}
 		do
-			create Result.make_with_capacity (5)
-			Result.put (create {JSON_STRING}.make_from_string (title), "title")
-			Result.put (create {JSON_STRING}.make_from_string (locale), "locale")
-			Result.put (auto_recalc.to_json, "autoRecalc")
-			Result.put (create {JSON_STRING}.make_from_string (time_zone), "timeZone")
-			Result.put (default_format.to_json, "defaultFormat")
+			create Result.make_empty
+			if attached title as l_title then
+				Result.put (create {JSON_STRING}.make_from_string (l_title), "title")
+			end
+			if attached locale as l_locale then
+				Result.put (create {JSON_STRING}.make_from_string (l_locale), "locale")
+			end
+			if attached auto_recalc as l_auto_recalc then
+				Result.put (l_auto_recalc.to_json, "autoRecalc")
+			end
+			if attached time_zone as l_time_zone then
+				Result.put (create {JSON_STRING}.make_from_string (l_time_zone), "timeZone")
+			end
 			if attached iterative_calculation_settings  as l_ics then
-				Result.put (default_format.to_json, "iterativeCalculationSettings")
+				Result.put (l_ics.to_json, "iterativeCalculationSettings")
+			end
+			if attached spreadsheet_theme as l_sp then
+				Result.put (l_sp.to_json, "spreadsheetTheme")
 			end
-			Result.put (spreadsheet_theme.to_json, "spreadsheetTheme")
-
 		end
 
 end