Fixed compilation for EiffelStudio 17.05

Author: jocelyn

CJ-client-safe.ecf

@@ -11,7 +11,7 @@
 		</option>
 		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="cj" location="lib\CJ\library\cj-safe.ecf"/>
+		<library name="cj" location="lib\CJ\library\cj-safe.ecf" readonly="false"/>
 		<library name="docking" location="$ISE_LIBRARY\library\docking\docking-safe.ecf"/>
 		<library name="encoder" location="lib\EWF\library\text\encoder\encoder-safe.ecf"/>
 		<library name="http" location="lib\EWF\library\network\protocol\http\http-safe.ecf" readonly="false"/>

lib/CJ/library/converter/cj_arrayed_list_json_converter.e

@@ -44,7 +44,7 @@ feature -- Conversion
         local
 			failed: BOOLEAN
         do
-            create Result.make_array
+            create Result.make (o.count)
             across
             	o as c
             loop

src/cj_client_application.e

@@ -36,6 +36,6 @@ feature {NONE} -- Initialization
 
 feature {NONE} -- Implementation
 
-	main_window: detachable EV_WINDOW
+	main_window: detachable CJ_CLIENT_WINDOW
 
 end

src/cj_client_window.e

@@ -8,35 +8,65 @@ class
 	CJ_CLIENT_WINDOW
 
 inherit
-	EV_TITLED_WINDOW
+	ANY
 		redefine
-			initialize,
+			default_create
+		end
+
+feature {NONE} -- Initialization
+
+	default_create
+		do
 			create_interface_objects
+			initialize_tools (docking_manager)
+			initialize
 		end
 
+feature -- Access
+
+	window: EV_TITLED_WINDOW
+
+	main_box: EV_VERTICAL_BOX
+
+
 feature {NONE} -- Initialization
 
 	create_interface_objects
+		local
+			win: EV_TITLED_WINDOW
+			vb: EV_VERTICAL_BOX
+			dm: SD_DOCKING_MANAGER
 		do
-			Precursor
 			create field_url
 
 			create button_go.make_with_text ("Go")
 			create button_settings.make_with_text ("...")
 
 			create cj_client_proxy.make (create {CJ_CLIENT}.make (""))
 
-			create information_tool.make (cj_client_proxy)
-			create queries_tool.make (cj_client_proxy)
-			queries_tool.on_query_actions.extend (agent explore_query)
-			create template_tool.make (cj_client_proxy)
-			create formatted_body_tool.make (cj_client_proxy)
-			create http_response_tool.make (cj_client_proxy)
-			create header_tool.make (cj_client_proxy)
+			create win
+			create vb
+			win.extend (vb)
+			window := win
+			main_box := vb
+
+			create dm.make (vb, window)
+			docking_manager := dm
 
 			cj_client_proxy.context_adaptation_agents.extend (agent updated_context)
 		end
 
+	initialize_tools (dm: SD_DOCKING_MANAGER)
+		do
+			create information_tool.make (cj_client_proxy, dm)
+			create queries_tool.make (cj_client_proxy, dm)
+			create template_tool.make (cj_client_proxy, dm)
+			create formatted_body_tool.make (cj_client_proxy, dm)
+			create http_response_tool.make (cj_client_proxy, dm)
+			create header_tool.make (cj_client_proxy, dm)
+			queries_tool.on_query_actions.extend (agent explore_query)
+		end
+
 	initialize
 			-- Initialize `Current'.
 		local
@@ -47,10 +77,7 @@ feature {NONE} -- Initialization
 			dm: like docking_manager
 			f: RAW_FILE
 		do
-			Precursor
-			create vb
-			extend (vb)
-
+			vb := main_box
 			vb.set_border_width (3)
 
 			create hb
@@ -69,11 +96,10 @@ feature {NONE} -- Initialization
 			vb.extend (hb)
 			vb.disable_item_expand (hb)
 
-
-			create dm.make (vb, Current)
-			docking_manager := dm
+			dm := docking_manager
 			create f.make ("layout.db")
 			dm.close_editor_place_holder
+			initialize_tools (dm)
 			dm.contents.extend (information_tool.sd_content)
 			dm.contents.extend (queries_tool.sd_content)
 			dm.contents.extend (template_tool.sd_content)
@@ -97,8 +123,8 @@ feature {NONE} -- Initialization
 				information_tool.set_focus
 			end
 
-			set_title ("Collection-JSON explorer")
-			set_size (800, 600)
+			window.set_title ("Collection-JSON explorer")
+			window.set_size (800, 600)
 
 			initialize_actions
 
@@ -113,11 +139,16 @@ feature {NONE} -- Initialization
 			button_go.select_actions.extend (agent on_go)
 			button_settings.select_actions.extend (agent on_settings)
 
-			close_request_actions.extend (agent on_quit)
+			window.close_request_actions.extend (agent on_quit)
 		end
 
 feature -- Action
 
+	show
+		do
+			window.show
+		end
+
 	on_quit
 		do
 			if attached docking_manager as dm then
@@ -126,7 +157,7 @@ feature -- Action
 					-- .. too bad
 				end
 			end
-			destroy_and_exit_if_last
+			window.destroy_and_exit_if_last
 		end
 
 	on_go
@@ -185,14 +216,14 @@ feature -- Explore
 			last_collection := Void
 			if not retried then
 				set_field_url_from_location (q.href)
-				set_pointer_style (stock_pixmaps.Busy_cursor)
+				window.set_pointer_style (stock_pixmaps.Busy_cursor)
 				if
 					attached cj_client_proxy.query (q, Void) as resp
 				then
 					set_response (resp)
 				end
 			end
-			set_pointer_style (stock_pixmaps.Standard_cursor)
+			window.set_pointer_style (stock_pixmaps.Standard_cursor)
 		rescue
 			retried := True
 			retry
@@ -225,7 +256,7 @@ feature -- Explore
 			last_collection := Void
 			if not retried then
 				set_field_url_from_location (a_url)
-				set_pointer_style (stock_pixmaps.Busy_cursor)
+				window.set_pointer_style (stock_pixmaps.Busy_cursor)
 
 				if
 					attached cj_client_proxy.get (a_url, Void) as resp
@@ -234,7 +265,7 @@ feature -- Explore
 				end
 			end
 
-			set_pointer_style (stock_pixmaps.Standard_cursor)
+			window.set_pointer_style (stock_pixmaps.Standard_cursor)
 		rescue
 			retried := True
 			retry
@@ -613,6 +644,7 @@ feature -- Tools
 	formatted_body_tool: CJ_FORMATTED_BODY_TOOL
 
 	http_response_tool: CJ_HTTP_RESPONSE_TOOL
+
 	header_tool: CJ_HEADER_TOOL
 
 feature -- Widget
@@ -641,7 +673,7 @@ feature -- Widget
 
 feature -- UI widgets
 
-	docking_manager: detachable SD_DOCKING_MANAGER
+	docking_manager: SD_DOCKING_MANAGER
 
 	set_template_tab_displayed (b: BOOLEAN)
 		do

src/gui/cj_tool.e

@@ -9,8 +9,9 @@ deferred class
 
 feature {NONE} -- Initialization
 
-	make (cl: like cj_client)
+	make (cl: like cj_client; dm: like docking_manager)
 		do
+			docking_manager := dm
 			cj_client := cl
 			create_interface_objects
 			initialize
@@ -22,12 +23,14 @@ feature {NONE} -- Initialization
 
 	initialize
 		do
-			create sd_content.make_with_widget (widget, title)
+			create sd_content.make_with_widget (widget, title, docking_manager)
 			sd_content.set_short_title (title)
 			sd_content.set_long_title (title)
 			sd_content.close_request_actions.extend (agent hide)
 		end
 
+	docking_manager: SD_DOCKING_MANAGER
+
 feature -- Access
 
 	cj_client: CJ_CLIENT_PROXY

src/kernel/cj_client.e

@@ -115,7 +115,7 @@ feature -- Access
 			end
 			l_ctx.add_header ("Content-Type", "application/vnd.collection+json")
 			l_ctx.add_header ("Accept", "application/vnd.collection+json")
-				
+
 
 			if attached cj_template_to_json (tpl) as j then
 				d := "{ %"template%": " + j.representation + " }"
@@ -266,9 +266,10 @@ feature -- Access
 		local
 			p: JSON_PARSER
 		do
-			create p.make_parser (s)
+			create p.make_with_string (s)
+			p.parse_content
 			if
-				attached p.parse as v and then
+				attached p.parsed_json_value as v and then
 				p.is_parsed
 			then
 				Result := v