Skip to content

Commit 816266d

Browse files
committed
Use docking library to have flexible layout
Added support for Create/Update/Query Delete is displayed but is not yet implemented. Fixed various minor issues. Note: it relies on recent version of EWF
1 parent e9cf9cb commit 816266d

13 files changed

+1052
-120
lines changed

CJ-client-safe.ecf

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="ISO-8859-1"?>
1+
<?xml version="1.0" encoding="ISO-8859-1"?>
22
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="cj-client" uuid="FCEA5603-8163-4FE6-B57C-81C37BD8DD44">
33
<target name="cj-client">
44
<root class="CJ_CLIENT_APPLICATION" feature="make_and_launch"/>
@@ -12,8 +12,10 @@
1212
<setting name="concurrency" value="thread"/>
1313
<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
1414
<library name="cj" location="..\CJ\library\cj-safe.ecf"/>
15-
<library name="http_client" location="..\..\EWF-jocelyn\library\network\http_client\http_client-safe.ecf"/>
16-
<library name="json.ecf" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf"/>
15+
<library name="docking" location="$ISE_LIBRARY\library\docking\docking-safe.ecf"/>
16+
<library name="encoder" location="..\..\EWF\library\text\encoder\encoder-safe.ecf"/>
17+
<library name="http_client" location="..\..\EWF\library\network\http_client\http_client-safe.ecf"/>
18+
<library name="json" location="..\..\EWF\contrib\library\text\parser\json\library\json-safe.ecf"/>
1719
<library name="thread" location="$ISE_LIBRARY\library\thread\thread-safe.ecf"/>
1820
<library name="vision2" location="$ISE_LIBRARY\library\vision2\vision2-safe.ecf"/>
1921
<cluster name="src" location=".\src\" recursive="true"/>

CJ-client.ecf

+6-3
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@
1010
<option warning="true" full_class_checking="true" void_safety="none" syntax="standard">
1111
</option>
1212
<setting name="concurrency" value="thread"/>
13-
<library name="cj" location="..\CJ\library\cj.ecf"/>
14-
<library name="http_client" location="..\..\EWF-jocelyn\library\network\http_client\http_client.ecf"/>
15-
<library name="json.ecf" location="$ISE_LIBRARY/library/json.ecf/json.ecf.ecf"/>
1613
<library name="base" location="$ISE_LIBRARY/library/base/base.ecf"/>
14+
<library name="cj" location="..\CJ\library\cj.ecf"/>
15+
<library name="docking" location="$ISE_LIBRARY\library\docking\docking.ecf"/>
16+
<library name="encoder" location="..\..\EWF\library\text\encoder\encoder.ecf"/>
17+
<library name="http_client" location="..\..\EWF\library\network\http_client\http_client.ecf"/>
18+
<library name="json" location="$ISE_LIBRARY/library/json.ecf/json.ecf.ecf"/>
1719
<library name="thread" location="$ISE_LIBRARY/library/thread/thread.ecf"/>
20+
<library name="vision2" location="$ISE_LIBRARY\library\vision2\vision2.ecf"/>
1821
<cluster name="src" location="./src" recursive="true"/>
1922
</target>
2023
</system>

src/cj_client_application.e

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ feature {NONE} -- Initialization
2020
w: CJ_CLIENT_WINDOW
2121
args: ARGUMENTS
2222
do
23+
default_create
24+
2325
create w
2426
main_window := w
25-
26-
default_create
2727
w.show
2828

2929
create args
@@ -36,6 +36,6 @@ feature {NONE} -- Initialization
3636

3737
feature {NONE} -- Implementation
3838

39-
main_window: EV_WINDOW
39+
main_window: detachable EV_WINDOW
4040

4141
end

0 commit comments

Comments
 (0)