Changeset 1673

jmatter-complet/branches/TRY-pseudofield/JMatter.iws

r1664	r1673
17	17	<component name="ChangeListManager">
18	18	<list default="true" readonly="true" name="Default" comment="">
	19	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/field/AggregateField.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/field/AggregateField.java" />
	20	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/model/ComplexType.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/model/ComplexType.java" />
	21	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/model/EObject.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/model/EObject.java" />
	22	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/field/AtomicField.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/field/AtomicField.java" />
	23	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/field/CompositeIndexedField.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/field/CompositeIndexedField.java" />
	24	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/persist/HibernatePersistor.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/persist/HibernatePersistor.java" />
	25	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/RelationalListView.java" afterPath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/RelationalListView.java" />
	26	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/ExpandableView.java" afterPath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/ExpandableView.java" />
	27	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/list/CompositeList.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/list/CompositeList.java" />
	28	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/wingsvm/src/com/u2d/view/wings/list/ExpandableView.java" afterPath="$PROJECT_DIR$/modules/wingsvm/src/com/u2d/view/wings/list/ExpandableView.java" />
19	29	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/test-app/src/class-list.json" afterPath="$PROJECT_DIR$/test-app/src/class-list.json" />
20		<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/persist/HibernatePersistor.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/persist/HibernatePersistor.java" />
21		<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/model/Harvester.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/model/Harvester.java" />
	30	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/EditableListView.java" afterPath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/EditableListView.java" />
	31	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/field/AssociationField.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/field/AssociationField.java" />
	32	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/atom/AtomicView.java" afterPath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/atom/AtomicView.java" />
	33	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/element/Field.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/element/Field.java" />
	34	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/list/RelationalList.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/list/RelationalList.java" />
	35	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/field/IndexedField.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/field/IndexedField.java" />
22	36	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/JMatter.iws" afterPath="$PROJECT_DIR$/JMatter.iws" />
23		<change type="MODIFICATION" beforePath="$PROJECT_DIR$/test-app/test-app.iml" afterPath="$PROJECT_DIR$/test-app/test-app.iml" />
	37	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/model/AbstractEObject.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/model/AbstractEObject.java" />
	38	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/atom/AtomicViewReadOnly.java" afterPath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/atom/AtomicViewReadOnly.java" />
	39	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/persist/MultiSessionPersistor.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/persist/MultiSessionPersistor.java" />
24	40	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/model/NullAssociation.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/model/NullAssociation.java" />
25		~~<change type="MODIFICATION" beforePath="/home/eitan/work/css4swing/css4swing.iml" afterPath="/home/eitan/work/css4swing/css4swing.iml" />~~
26	41	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/SwingViewMechanism.java" afterPath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/SwingViewMechanism.java" />
27		<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/ExpandableView.java" afterPath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/ExpandableView.java" />
28		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/field/AssociationField.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/field/AssociationField.java" />~~
29	42	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/field/CompositeField.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/field/CompositeField.java" />
30		<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/model/ComplexType.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/model/ComplexType.java" />
31		<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/atom/AtomicViewReadOnly.java" afterPath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/atom/AtomicViewReadOnly.java" />
32		<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/field/AggregateField.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/field/AggregateField.java" />
33		<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/wingsvm/wingsvm.iml" afterPath="$PROJECT_DIR$/modules/wingsvm/wingsvm.iml" />
	43	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/CompositeTabularView.java" afterPath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/CompositeTabularView.java" />
	44	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/dnd/RelationalListDropTarget.java" afterPath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/dnd/RelationalListDropTarget.java" />
	45	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/StateCardPanel.java" afterPath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/StateCardPanel.java" />
	46	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/MultiPickView.java" afterPath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/MultiPickView.java" />
	47	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/find/FieldPath.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/find/FieldPath.java" />
	48	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/CompositeTableView.java" afterPath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/CompositeTableView.java" />
	49	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/echovm/src/com/u2d/view/echo/EchoViewMechanism.java" afterPath="$PROJECT_DIR$/modules/echovm/src/com/u2d/view/echo/EchoViewMechanism.java" />
34	50	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/ReorderListView.java" afterPath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/ReorderListView.java" />
35		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/list/RelationalList.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/list/RelationalList.java" />~~
36		<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/tools/JMNewProjectFrontEnd/JMNewProjectFrontEnd.iml" afterPath="$PROJECT_DIR$/jmatter/tools/JMNewProjectFrontEnd/JMNewProjectFrontEnd.iml" />
37		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/Core.iml" afterPath="$PROJECT_DIR$/jmatter/Core.iml" />~~
38		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/MyTunes/MyTunes.iml" afterPath="$PROJECT_DIR$/demo-apps/MyTunes/MyTunes.iml" />~~
39		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/JMatter.ipr" afterPath="$PROJECT_DIR$/JMatter.ipr" />~~
40		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/ContactMgr/ContactMgr.iml" afterPath="$PROJECT_DIR$/demo-apps/ContactMgr/ContactMgr.iml" />~~
41		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/echovm/echovm.iml" afterPath="$PROJECT_DIR$/modules/echovm/echovm.iml" />~~
42		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/resources/hibernate.properties" afterPath="$PROJECT_DIR$/demo-apps/Sympster/resources/hibernate.properties" />~~
43		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/persist/MultiSessionPersistor.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/persist/MultiSessionPersistor.java" />~~
44		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/field/CompositeIndexedField.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/field/CompositeIndexedField.java" />~~
45		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/model/AbstractEObject.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/model/AbstractEObject.java" />~~
46		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Self/Self.iml" afterPath="$PROJECT_DIR$/demo-apps/Self/Self.iml" />~~
47		<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/dnd/RelationalListDropTarget.java" afterPath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/dnd/RelationalListDropTarget.java" />
48		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/IssueMgr/IssueMgr.iml" afterPath="$PROJECT_DIR$/demo-apps/IssueMgr/IssueMgr.iml" />~~
49		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/element/Field.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/element/Field.java" />~~
50		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/ds-swing/ds-swing.iml" afterPath="$PROJECT_DIR$/modules/ds-swing/ds-swing.iml" />~~
51		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/swingvm/swingvm.iml" afterPath="$PROJECT_DIR$/modules/swingvm/swingvm.iml" />~~
52		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/find/FieldPath.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/find/FieldPath.java" />~~
53		<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/StateCardPanel.java" afterPath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/StateCardPanel.java" />
54		<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/EditableListView.java" afterPath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/EditableListView.java" />
55		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/ds-wizard/ds-wizard.iml" afterPath="$PROJECT_DIR$/modules/ds-wizard/ds-wizard.iml" />~~
56		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/field/AtomicField.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/field/AtomicField.java" />~~
57		<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/MultiPickView.java" afterPath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/MultiPickView.java" />
58		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/AppBrowser/AppBrowser.iml" afterPath="$PROJECT_DIR$/AppBrowser/AppBrowser.iml" />~~
59		<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/RelationalListView.java" afterPath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/RelationalListView.java" />
60		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/list/CompositeList.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/list/CompositeList.java" />~~
61		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/model/EObject.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/model/EObject.java" />~~
62		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/model/AbstractListEO.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/model/AbstractListEO.java" />~~
63		<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/CompositeTableView.java" afterPath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/CompositeTableView.java" />
64		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Talk.java" afterPath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Talk.java" />~~
65		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/Sympster.iml" afterPath="$PROJECT_DIR$/demo-apps/Sympster/Sympster.iml" />~~
66		<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/atom/AtomicView.java" afterPath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/atom/AtomicView.java" />
67		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/field/IndexedField.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/field/IndexedField.java" />~~
68		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Session.java" afterPath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Session.java" />~~
69		~~<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/jmatter-tools/jmatter-tools.iml" afterPath="$PROJECT_DIR$/modules/jmatter-tools/jmatter-tools.iml" />~~
70		<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/CompositeTabularView.java" afterPath="$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/CompositeTabularView.java" />
71	51	</list>
72	52	<ignored path="JMatter.iws" />
…	…
134	114	<property name="method_breakpoints_groupByClasses" value="true" />
135	115	<property name="exception_breakpoints_viewId" value="TABLE" />
	116	<property name="exception_breakpoints_groupByClasses" value="true" />
136	117	<property name="field_breakpoints_viewId" value="TABLE" />
137		~~<property name="exception_breakpoints_groupByClasses" value="true" />~~
138	118	<property name="method_breakpoints_groupByMethods" value="false" />
139	119	</ui_properties>
…	…
151	131	</component>
152	132	<component name="FileEditorManager">
153		<leaf />
	133	<leaf>
	134	<file leaf-file-name="FieldPath.java" pinned="false" current="false" current-in-tab="false">
	135	<entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/find/FieldPath.java">
	136	<provider selected="true" editor-type-id="text-editor">
	137	<state line="113" column="0" selection-start="3246" selection-end="3246" vertical-scroll-proportion="0.0">
	138	<folding />
	139	</state>
	140	</provider>
	141	</entry>
	142	</file>
	143	<file leaf-file-name="Worker.java" pinned="false" current="false" current-in-tab="false">
	144	<entry file="file://$PROJECT_DIR$/test-app/src/com/u2d/domain/Worker.java">
	145	<provider selected="true" editor-type-id="text-editor">
	146	<state line="12" column="0" selection-start="330" selection-end="330" vertical-scroll-proportion="0.0">
	147	<folding />
	148	</state>
	149	</provider>
	150	</entry>
	151	</file>
	152	<file leaf-file-name="CriteriaQueryTranslator.java" pinned="false" current="true" current-in-tab="true">
	153	<entry file="file:///home/eitan/work/thirdparty/hibernate-3.2/src/org/hibernate/loader/criteria/CriteriaQueryTranslator.java">
	154	<provider selected="true" editor-type-id="text-editor">
	155	<state line="192" column="0" selection-start="6623" selection-end="6623" vertical-scroll-proportion="0.021367522">
	156	<folding />
	157	</state>
	158	</provider>
	159	</entry>
	160	</file>
	161	</leaf>
154	162	</component>
155	163	<component name="FindManager">
…	…
174	182	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
175	183	</PATH_ELEMENT>
	184	<PATH_ELEMENT>
	185	<option name="myItemId" value="wingsvm" />
	186	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
	187	</PATH_ELEMENT>
	188	</PATH>
	189	<PATH>
	190	<PATH_ELEMENT>
	191	<option name="myItemId" value="JMatter" />
	192	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
	193	</PATH_ELEMENT>
	194	<PATH_ELEMENT>
	195	<option name="myItemId" value="wingsvm" />
	196	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
	197	</PATH_ELEMENT>
	198	<PATH_ELEMENT>
	199	<option name="myItemId" value="com.u2d.view.wings.list" />
	200	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
	201	</PATH_ELEMENT>
176	202	</PATH>
177	203	<PATH>
…	…
204	230	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
205	231	</PATH_ELEMENT>
	232	</PATH>
	233	<PATH>
	234	<PATH_ELEMENT>
	235	<option name="myItemId" value="JMatter" />
	236	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
	237	</PATH_ELEMENT>
206	238	<PATH_ELEMENT>
207	239	<option name="myItemId" value="swingvm" />
…	…
257	289	</PATH_ELEMENT>
258	290	<PATH_ELEMENT>
	291	<option name="myItemId" value="echovm" />
	292	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
	293	</PATH_ELEMENT>
	294	</PATH>
	295	<PATH>
	296	<PATH_ELEMENT>
	297	<option name="myItemId" value="JMatter" />
	298	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
	299	</PATH_ELEMENT>
	300	<PATH_ELEMENT>
	301	<option name="myItemId" value="echovm" />
	302	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
	303	</PATH_ELEMENT>
	304	<PATH_ELEMENT>
	305	<option name="myItemId" value="com.u2d.view.echo" />
	306	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
	307	</PATH_ELEMENT>
	308	</PATH>
	309	<PATH>
	310	<PATH_ELEMENT>
	311	<option name="myItemId" value="JMatter" />
	312	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
	313	</PATH_ELEMENT>
	314	<PATH_ELEMENT>
259	315	<option name="myItemId" value="ds-swing" />
260	316	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
…	…
295	351	</PATH_ELEMENT>
296	352	<PATH_ELEMENT>
	353	<option name="myItemId" value="com.u2d.persist" />
	354	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
	355	</PATH_ELEMENT>
	356	</PATH>
	357	<PATH>
	358	<PATH_ELEMENT>
	359	<option name="myItemId" value="JMatter" />
	360	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
	361	</PATH_ELEMENT>
	362	<PATH_ELEMENT>
	363	<option name="myItemId" value="Core" />
	364	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
	365	</PATH_ELEMENT>
	366	<PATH_ELEMENT>
297	367	<option name="myItemId" value="com.u2d.model" />
298	368	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
…	…
309	379	</PATH_ELEMENT>
310	380	<PATH_ELEMENT>
	381	<option name="myItemId" value="com.u2d.list" />
	382	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
	383	</PATH_ELEMENT>
	384	</PATH>
	385	<PATH>
	386	<PATH_ELEMENT>
	387	<option name="myItemId" value="JMatter" />
	388	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
	389	</PATH_ELEMENT>
	390	<PATH_ELEMENT>
	391	<option name="myItemId" value="Core" />
	392	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
	393	</PATH_ELEMENT>
	394	<PATH_ELEMENT>
311	395	<option name="myItemId" value="com.u2d.find.inequalities" />
312	396	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
…	…
339	423	<option name="myItemId" value="com.u2d.field" />
340	424	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
	425	</PATH_ELEMENT>
	426	</PATH>
	427	<PATH>
	428	<PATH_ELEMENT>
	429	<option name="myItemId" value="JMatter" />
	430	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
	431	</PATH_ELEMENT>
	432	<PATH_ELEMENT>
	433	<option name="myItemId" value="AppBrowser" />
	434	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
	435	</PATH_ELEMENT>
	436	<PATH_ELEMENT>
	437	<option name="myItemId" value="Libraries" />
	438	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewLibrariesNode" />
	439	</PATH_ELEMENT>
	440	</PATH>
	441	<PATH>
	442	<PATH_ELEMENT>
	443	<option name="myItemId" value="JMatter" />
	444	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
	445	</PATH_ELEMENT>
	446	<PATH_ELEMENT>
	447	<option name="myItemId" value="AppBrowser" />
	448	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
	449	</PATH_ELEMENT>
	450	<PATH_ELEMENT>
	451	<option name="myItemId" value="Libraries" />
	452	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewLibrariesNode" />
	453	</PATH_ELEMENT>
	454	<PATH_ELEMENT>
	455	<option name="myItemId" value="type" />
	456	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
	457	</PATH_ELEMENT>
	458	</PATH>
	459	<PATH>
	460	<PATH_ELEMENT>
	461	<option name="myItemId" value="JMatter" />
	462	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
	463	</PATH_ELEMENT>
	464	<PATH_ELEMENT>
	465	<option name="myItemId" value="AppBrowser" />
	466	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
	467	</PATH_ELEMENT>
	468	<PATH_ELEMENT>
	469	<option name="myItemId" value="Libraries" />
	470	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewLibrariesNode" />
	471	</PATH_ELEMENT>
	472	<PATH_ELEMENT>
	473	<option name="myItemId" value="criteria" />
	474	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
	475	</PATH_ELEMENT>
	476	</PATH>
	477	<PATH>
	478	<PATH_ELEMENT>
	479	<option name="myItemId" value="JMatter" />
	480	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
	481	</PATH_ELEMENT>
	482	<PATH_ELEMENT>
	483	<option name="myItemId" value="AppBrowser" />
	484	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
341	485	</PATH_ELEMENT>
342	486	</PATH>
…	…
384	528	</component>
385	529	<component name="PropertiesComponent">
	530	<property name="project.structure.last.edited" value="Modules" />
386	531	<property name="TEMP_MODULE_EXPLODED_DIR_FOR_Sympster/web/Web" value="/tmp/webExplodedDir56733tmp" />
387		~~<property name="project.structure.last.edited" value="Modules" />~~
388	532	<property name="project.structure.proportion" value="0.0" />
389	533	<property name="options.splitter.main.proportions" value="0.3" />
…	…
409	553	<property name="TEMP_MODULE_EXPLODED_DIR_FOR_Sympster/web/Web2" value="/tmp/webExplodedDir56734tmp" />
410	554	<property name="project.structure.side.proportion" value="0.0" />
	555	<property name="MemberChooser.copyJavadoc" value="false" />
411	556	<property name="TEMP_MODULE_EXPLODED_DIR_FOR_MyTunes/web/Web" value="/private/tmp/webExplodedDir7160tmp" />
412		~~<property name="MemberChooser.copyJavadoc" value="false" />~~
413	557	<property name="options.searchVisible" value="true" />
414	558	</component>
…	…
871	1015	</component>
872	1016	<component name="ToolWindowManager">
873		<frame x="0" y="25" width="1440" height="850" extended-state="0" />
	1017	<frame x="0" y="25" width="1440" height="850" extended-state="1" />
874	1018	<editor active="true" />
875	1019	<layout>
876	1020	<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" />
877	1021	<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2716763" sideWeight="0.5" order="6" side_tool="false" />
878		<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" />
	1022	<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" />
879	1023	<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24658519" sideWeight="0.5" order="1" side_tool="false" />
880	1024	<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33333334" sideWeight="0.5" order="1" side_tool="false" />
881	1025	<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.43347052" sideWeight="0.5" order="3" side_tool="false" />
882		<window_info id="Dataflow to this" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" />
	1026	<window_info id="Dataflow to this" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" />
883	1027	<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="14" side_tool="false" />
884	1028	<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3127572" sideWeight="0.5" order="9" side_tool="false" />
885	1029	<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" />
886	1030	<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2615607" sideWeight="0.5569273" order="1" side_tool="false" />
887		<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" />
888		<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2~~16763" sideWeight="0.6776406~~" order="0" side_tool="false" />
	1031	<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" />
	1032	<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27745664" sideWeight="0.0" order="0" side_tool="false" />
889	1033	<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="11" side_tool="false" />
890		<window_info id="Web Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" />
	1034	<window_info id="Web Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" />
891	1035	<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="6" side_tool="false" />
892	1036	<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.43484226" sideWeight="0.5" order="2" side_tool="false" x="-4" y="25" width="1032" height="721" />
…	…
1069	1213	</component>
1070	1214	<component name="editorHistoryManager">
1071		<entry file="file://$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/EOPanel.java">
	1215	<entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/persist/MultiSessionPersistor.java">
	1216	<provider selected="true" editor-type-id="text-editor">
	1217	<state line="2" column="36" selection-start="62" selection-end="62" vertical-scroll-proportion="0.042735044">
	1218	<folding />
	1219	</state>
	1220	</provider>
	1221	</entry>
	1222	<entry file="file://$PROJECT_DIR$/modules/wingsvm/src/com/u2d/view/wings/list/ExpandableView.java">
	1223	<provider selected="true" editor-type-id="text-editor">
	1224	<state line="42" column="0" selection-start="1017" selection-end="1017" vertical-scroll-proportion="0.5897436">
	1225	<folding />
	1226	</state>
	1227	</provider>
	1228	</entry>
	1229	<entry file="file://$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/ExpandableView.java">
	1230	<provider selected="true" editor-type-id="text-editor">
	1231	<state line="30" column="25" selection-start="694" selection-end="694" vertical-scroll-proportion="0.4059829">
	1232	<folding />
	1233	</state>
	1234	</provider>
	1235	</entry>
	1236	<entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/model/ComplexType.java">
	1237	<provider selected="true" editor-type-id="text-editor">
	1238	<state line="1063" column="0" selection-start="31476" selection-end="31476" vertical-scroll-proportion="1.4585153">
	1239	<folding />
	1240	</state>
	1241	</provider>
	1242	</entry>
	1243	<entry file="file://$PROJECT_DIR$/modules/echovm/src/com/u2d/view/echo/EchoViewMechanism.java">
	1244	<provider selected="true" editor-type-id="text-editor">
	1245	<state line="337" column="4" selection-start="7263" selection-end="7263" vertical-scroll-proportion="0.95726496">
	1246	<folding />
	1247	</state>
	1248	</provider>
	1249	</entry>
	1250	<entry file="file://$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/SwingViewMechanism.java">
	1251	<provider selected="true" editor-type-id="text-editor">
	1252	<state line="853" column="0" selection-start="25477" selection-end="25624" vertical-scroll-proportion="0.9358974">
	1253	<folding />
	1254	</state>
	1255	</provider>
	1256	</entry>
	1257	<entry file="file://$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/find/FindPanel.java">
	1258	<provider selected="true" editor-type-id="text-editor">
	1259	<state line="110" column="0" selection-start="2687" selection-end="2687" vertical-scroll-proportion="0.95726496">
	1260	<folding />
	1261	</state>
	1262	</provider>
	1263	</entry>
	1264	<entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/find/SimpleQuery.java">
	1265	<provider selected="true" editor-type-id="text-editor">
	1266	<state line="85" column="0" selection-start="2224" selection-end="2224" vertical-scroll-proportion="0.0">
	1267	<folding />
	1268	</state>
	1269	</provider>
	1270	</entry>
	1271	<entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/list/CompositeList.java">
1072	1272	<provider selected="true" editor-type-id="text-editor">
1073	1273	<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
…	…
1076	1276	</provider>
1077	1277	</entry>
1078		<entry file="file://$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/TitleBarView.java">
1079		<provider selected="true" editor-type-id="text-editor">
1080		<state line="42" column="29" selection-start="1195" selection-end="1195" vertical-scroll-proportion="0.0">
1081		<folding />
1082		</state>
1083		</provider>
1084		</entry>
1085		<entry file="file://$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/list/ListEOPanel.java">
1086		<provider selected="true" editor-type-id="text-editor">
1087		<state line="36" column="21" selection-start="1043" selection-end="1043" vertical-scroll-proportion="0.0">
1088		<folding />
1089		</state>
1090		</provider>
1091		</entry>
1092		<entry file="file://$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/find/FindPanel.java">
1093		<provider selected="true" editor-type-id="text-editor">
1094		<state line="96" column="0" selection-start="2412" selection-end="2412" vertical-scroll-proportion="0.0">
1095		<folding />
1096		</state>
1097		</provider>
1098		</entry>
1099		<entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/find/Inequality.java">
1100		<provider selected="true" editor-type-id="text-editor">
1101		<state line="15" column="0" selection-start="251" selection-end="251" vertical-scroll-proportion="0.0">
1102		<folding />
1103		</state>
1104		</provider>
1105		</entry>
1106		<entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/field/PseudoField.java">
	1278	<entry file="file://$PROJECT_DIR$/modules/ds-swing/src/com/u2d/ui/JComboTree.java">
1107	1279	<provider selected="true" editor-type-id="text-editor">
1108	1280	<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
…	…
1111	1283	</provider>
1112	1284	</entry>
1113		<entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/find/inequalities/ContainsInequality.java">
1114		<provider selected="true" editor-type-id="text-editor">
1115		<state line="46" column="76" selection-start="1252" selection-end="1272" vertical-scroll-proportion="0.0">
1116		<folding />
1117		</state>
1118		</provider>
1119		</entry>
1120		<entry file="file://$PROJECT_DIR$/modules/ds-swing/src/com/u2d/ui/JComboTree.java">
1121		<provider selected="true" editor-type-id="text-editor">
1122		<state line="172" column="0" selection-start="4566" selection-end="4566" vertical-scroll-proportion="0.6596306">
	1285	<entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/field/CompositeIndexedField.java">
	1286	<provider selected="true" editor-type-id="text-editor">
	1287	<state line="87" column="4" selection-start="2229" selection-end="2229" vertical-scroll-proportion="0.0">
1123	1288	<folding>
1124	1289	<element signature="imports" expanded="true" />
…	…
1127	1292	</provider>
1128	1293	</entry>
1129		<entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/find/inequalities/TextualInequalities.java">
1130		<provider selected="true" editor-type-id="text-editor">
1131		<state line="63" column="44" selection-start="1788" selection-end="1788" vertical-scroll-proportion="0.0">
1132		<folding />
1133		</state>
1134		</provider>
1135		</entry>
1136		<entry file="file://$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/find/FieldFilter.java">
1137		<provider selected="true" editor-type-id="text-editor">
1138		<state line="311" column="31" selection-start="8782" selection-end="8782" vertical-scroll-proportion="0.0">
1139		<folding>
1140		<element signature="imports" expanded="true" />
1141		</folding>
1142		</state>
1143		</provider>
1144		</entry>
1145		<entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/find/QuerySpecification.java">
1146		<provider selected="true" editor-type-id="text-editor">
1147		<state line="53" column="15" selection-start="1396" selection-end="1396" vertical-scroll-proportion="0.0">
1148		<folding />
1149		</state>
1150		</provider>
1151		</entry>
1152		<entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/find/SimpleQuery.java">
1153		<provider selected="true" editor-type-id="text-editor">
1154		<state line="85" column="0" selection-start="2224" selection-end="2224" vertical-scroll-proportion="0.0">
	1294	<entry file="file:///home/eitan/work/thirdparty/hibernate-3.2/src/org/hibernate/type/CollectionType.java">
	1295	<provider selected="true" editor-type-id="text-editor">
	1296	<state line="449" column="17" selection-start="15571" selection-end="15571" vertical-scroll-proportion="0.573508">
	1297	<folding />
	1298	</state>
	1299	</provider>
	1300	</entry>
	1301	<entry file="file:///home/eitan/work/thirdparty/hibernate-3.2/src/org/hibernate/type/AssociationType.java">
	1302	<provider selected="true" editor-type-id="text-editor">
	1303	<state line="51" column="0" selection-start="1436" selection-end="1436" vertical-scroll-proportion="0.0">
1155	1304	<folding />
1156	1305	</state>
…	…
1159	1308	<entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/find/FieldPath.java">
1160	1309	<provider selected="true" editor-type-id="text-editor">
1161		<state line="49" column="62" selection-start="1208" selection-end="1229" vertical-scroll-proportion="0.33333334">
1162		<folding />
1163		</state>
1164		</provider>
1165		</entry>
1166		<entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/field/IndexedField.java">
1167		<provider selected="true" editor-type-id="text-editor">
1168		<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
	1310	<state line="113" column="0" selection-start="3246" selection-end="3246" vertical-scroll-proportion="0.0">
1169	1311	<folding />
1170	1312	</state>
…	…
1173	1315	<entry file="file://$PROJECT_DIR$/test-app/src/com/u2d/domain/Worker.java">
1174	1316	<provider selected="true" editor-type-id="text-editor">
1175		<state line="~~21" column="0" selection-start="663" selection-end="663" vertical-scroll-proportion="0.6728232~~">
1176		<folding />
1177		</state>
1178		</provider>
1179		</entry>
1180		<entry file="file://~~$PROJECT_DIR$/jmatter/src/com/u2d/model/ComplexType~~.java">
1181		<provider selected="true" editor-type-id="text-editor">
1182		<state line="1~~016" column="36" selection-start="29987" selection-end="29987" vertical-scroll-proportion="0.0~~">
	1317	<state line="12" column="0" selection-start="330" selection-end="330" vertical-scroll-proportion="0.0">
	1318	<folding />
	1319	</state>
	1320	</provider>
	1321	</entry>
	1322	<entry file="file:///home/eitan/work/thirdparty/hibernate-3.2/src/org/hibernate/loader/criteria/CriteriaQueryTranslator.java">
	1323	<provider selected="true" editor-type-id="text-editor">
	1324	<state line="192" column="0" selection-start="6623" selection-end="6623" vertical-scroll-proportion="0.021367522">
1183	1325	<folding />
1184	1326	</state>

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/element/Field.java

r1661	r1673
131	131	}
132	132
133		public abstract EObject get(~~Complex~~EObject parent);
134		public abstract void set(~~Complex~~EObject parent, Object value);
135		public void restore(~~Complex~~EObject parent, Object value)
	133	public abstract EObject get(EObject parent);
	134	public abstract void set(EObject parent, Object value);
	135	public void restore(EObject parent, Object value)
136	136	{
137	137	set(parent, value);
…	…
157	157	}
158	158
159		public abstract EView getView(~~Complex~~EObject parent);
	159	public abstract EView getView(EObject parent);
160	160	protected FieldViewHandler viewHandler;
161	161	public void setViewHandler(FieldViewHandler handler)
…	…
164	164	}
165	165
166		public abstract int validate(~~Complex~~EObject parent);
167		public abstract void setState(~~Complex~~EObject parent, State state);
168		public abstract void pushState(~~Complex~~EObject parent, State state);
169		public abstract void popState(~~Complex~~EObject parent);
170		public abstract void setStartState(~~Complex~~EObject parent);
	166	public abstract int validate(EObject parent);
	167	public abstract void setState(EObject parent, State state);
	168	public abstract void pushState(EObject parent, State state);
	169	public abstract void popState(EObject parent);
	170	public abstract void setStartState(EObject parent);
171	171
172	172	public EObject createInstance()
…	…
304	304	}
305	305
306		pr~~ivate~~ void computeFieldPaths()
	306	protected void computeFieldPaths()
307	307	{
308	308	StringBuffer path = new StringBuffer(name());
…	…
325	325	}
326	326
327		public boolean isEmpty(~~Complex~~EObject parent)
	327	public boolean isEmpty(EObject parent)
328	328	{
329	329	EObject value = get(parent);
…	…
482	482	public void setRequiredMethod(Method method) { _requiredMethod = method; }
483	483
484		public Required getRequired(~~Complex~~EObject parent)
	484	public Required getRequired(EObject parent)
485	485	{
486	486	if (_requiredMethod != null)

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/field/AggregateField.java

r1319	r1673
90	90
91	91
92		public EView getView(~~Complex~~EObject parent)
	92	public EView getView(EObject parent)
93	93	{
94	94	ComplexEObject value = (ComplexEObject) get(parent);
…	…
96	96	}
97	97
98		public int validate(~~Complex~~EObject parent)
	98	public int validate(EObject parent)
99	99	{
100	100	int result = 0;
…	…
110	110	}
111	111
112		public void setState(~~ComplexEObject parent, State state) { ((ComplexEObject) get(parent)).setState(state); }~~
113		public void pushState(~~Complex~~EObject parent, State state) { ((ComplexEObject) get(parent)).pushState(state); }
114		public void popState(~~Complex~~EObject parent) { ((ComplexEObject) get(parent)).popState(); }
115		public void setStartState(~~Complex~~EObject parent) { ((ComplexEObject) get(parent)).setStartState(); }
	112	public void setState(EObject parent, State state) { ((ComplexEObject) get(parent)).setState(state); }
	113	public void pushState(EObject parent, State state) { ((ComplexEObject) get(parent)).pushState(state); }
	114	public void popState(EObject parent) { ((ComplexEObject) get(parent)).popState(); }
	115	public void setStartState(EObject parent) { ((ComplexEObject) get(parent)).setStartState(); }
116	116
117	117	public boolean hasFieldOfType(Class cls)

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/field/AssociationField.java

r1561	r1673
176	176	}
177	177
178		public EObject get(~~Complex~~EObject parent)
	178	public EObject get(EObject parent)
179	179	{
180	180	EObject eo = (EObject) reflectGet(parent);
181	181	if (eo == null)
182		eo = new NullAssociation(this, parent);
	182	eo = new NullAssociation(this, (ComplexEObject) parent);
183	183	else
184	184	eo.setField(this, parent);
…	…
187	187
188	188	// set from persistence mechanism to restore objects..
189		public void restore(~~Complex~~EObject parent, Object value)
	189	public void restore(EObject parent, Object value)
190	190	{
191	191	if (value instanceof NullComplexEObject)
…	…
194	194	}
195	195
196		public void set(~~Complex~~EObject parent, Object value)
	196	public void set(EObject parent, Object value)
197	197	{
198	198	if (value instanceof NullComplexEObject)
…	…
246	246	}
247	247
248		public EView getView(~~Complex~~EObject parent)
249		{
250		Association association = association(parent);
	248	public EView getView(EObject parent)
	249	{
	250	Association association = association((ComplexEObject) parent);
251	251	return vmech().getAssociationView(association);
252	252	}
253	253
254		public int validate(~~Complex~~EObject parent)
255		{
256		Association association = ~~parent~~.association(name());
	254	public int validate(EObject parent)
	255	{
	256	Association association = ((ComplexEObject) parent).association(name());
257	257	Required required = getRequired(parent);
258	258	if (required.isit() && association.isEmpty())
…	…
265	265	}
266	266
267		public void setState(~~Complex~~EObject parent, State state)
	267	public void setState(EObject parent, State state)
268	268	{
269	269	// parent's state does not propagate to its associations.
…	…
279	279
280	280	// noops..
281		public void pushState(~~Complex~~EObject parent, State state) { }
282		public void popState(~~Complex~~EObject parent) { }
283		public void setStartState(~~Complex~~EObject parent) {}
284
285		private void checkAndSetDefault(~~Complex~~EObject parent, ComplexEObject ceo)
286		{
287		if (~~parent~~.isTransientState())
	281	public void pushState(EObject parent, State state) { }
	282	public void popState(EObject parent) { }
	283	public void setStartState(EObject parent) {}
	284
	285	private void checkAndSetDefault(EObject parent, ComplexEObject ceo)
	286	{
	287	if (((ComplexEObject) parent).isTransientState())
288	288	{
289	289	ComplexEObject defaultValue = getDefaultValue();
…	…
297	297	if (ceo instanceof NullComplexEObject && defaultValue != null)
298	298	{
299		association(~~parent~~).set(defaultValue);
	299	association(((ComplexEObject) parent)).set(defaultValue);
300	300	}
301	301	}

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/field/AtomicField.java

r1257	r1673
39	39	}
40	40
41		public EView getView(~~Complex~~EObject parent)
	41	public EView getView(EObject parent)
42	42	{
43	43	EObject value = get(parent);
…	…
111	111	}
112	112
113		public void setState(~~Complex~~EObject parent, State state)
	113	public void setState(EObject parent, State state)
114	114	{
115	115	EObject value = get(parent);
116		if (~~parent~~.isTransientState())
	116	if (((ComplexEObject) parent).isTransientState())
117	117	{
118	118	AtomicEObject aeo = ((AtomicEObject) value);
…	…
134	134	}
135	135
136		public void pushState(~~ComplexEObject parent, State state) { setState(parent, state); }~~
137		public void popState(~~ComplexEObject parent) { setState(parent, parent~~.getState()); }
138		public void setStartState(~~ComplexEObject parent) { setState(parent, parent~~.getState()); }
	136	public void pushState(EObject parent, State state) { setState(parent, state); }
	137	public void popState(EObject parent) { setState(parent, ((ComplexEObject) parent).getState()); }
	138	public void setStartState(EObject parent) { setState(parent, ((ComplexEObject) parent).getState()); }
139	139
140		public int validate(~~Complex~~EObject parent)
	140	public int validate(EObject parent)
141	141	{
142	142	AtomicEObject value = (AtomicEObject) get(parent);

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/field/CompositeField.java

r1443	r1673
34	34
35	35
36		public EObject get(~~Complex~~EObject parent)
	36	public EObject get(EObject parent)
37	37	{
38	38	EObject eo = (EObject) reflectGet(parent);
…	…
68	68	}
69	69
70		public void set(~~Complex~~EObject parent, Object value)
	70	public void set(EObject parent, Object value)
71	71	{
72	72	EObject eo = get(parent);

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/field/CompositeIndexedField.java

r1665	r1673
2	2
3	3	import com.u2d.list.CompositeList;
4		import com.u2d.model.ComplexEObject;
5		import com.u2d.model.EObject;
6		import com.u2d.model.FieldParent;
	4	import com.u2d.model.*;
	5	import com.u2d.element.Field;
7	6	import com.u2d.pattern.State;
8	7	import java.beans.IntrospectionException;
9	8	import java.beans.PropertyDescriptor;
10	9	import java.util.Iterator;
	10	import java.util.List;
	11	import java.util.ArrayList;
11	12
12	13	/**
…	…
16	17	* Time: 11:07:15 AM
17	18	*/
18		public class CompositeIndexedField extends IndexedField
	19	public class CompositeIndexedField extends IndexedField implements FieldParent
19	20	{
20	21	public CompositeIndexedField() {}
…	…
23	24	{
24	25	super(parent, descriptor);
	26	init();
25	27	}
26	28	public CompositeIndexedField(FieldParent parent, String name)
…	…
28	30	{
29	31	super(parent, name);
	32	init();
	33	}
	34
	35	private void init()
	36	{
	37	_pseudoFields = (List<String>) Harvester.introspectArrayField(_parent.getJavaClass(), name()+"PseudoFields");
30	38	}
31	39
32	40	public boolean isComposite() { return true; }
33	41
34		public EObject get(~~Complex~~EObject parent)
	42	public EObject get(EObject parent)
35	43	{
36	44	final CompositeList list = (CompositeList) super.get(parent);
37		for (~~Iterator itr = list.iterator(); itr.hasNext();~~ )
	45	for (int i=0; i<list.getSize(); i++)
38	46	{
39		ComplexEObject ceo = (ComplexEObject) ~~itr.next(~~);
40		ceo.setField(~~CompositeIndexedField.this, list.parentObject()~~);
	47	ComplexEObject ceo = (ComplexEObject) list.getElementAt(i);
	48	ceo.setField(fields().get(i), this);
41	49	}
42	50	return list;
43	51	}
44	52
45		public int validate(~~Complex~~EObject parent)
	53	public int validate(EObject parent)
46	54	{
47	55	int count = super.validate(parent);
…	…
51	59
52	60
53		public void restore(~~Complex~~EObject parent, Object value)
	61	public void restore(EObject parent, Object value)
54	62	{
55	63	super.restore(parent, value);
…	…
62	70	}
63	71
64		// ==
65		public void setState(ComplexEObject parent, State state)
66		{
67		((CompositeList) get(parent)).setState(state);
68		}
	72	// ===
	73	private List<String> _pseudoFields = new ArrayList<String>(0);
69	74
70		public void pushState(ComplexEObject parent, State state)
71		{
72		((CompositeList) get(parent)).pushState(state);
73		}
	75	private List<Field> _fields;
	76	public synchronized List<Field> fields()
	77	{
	78	if (_fields == null)
	79	{
	80	_fields = new ArrayList<Field>();
74	81
75		public void popState(ComplexEObject parent)
76		{
77		((CompositeList) get(parent)).popState();
78		}
	82	for (String pseudoFieldName : _pseudoFields)
	83	{
	84	_fields.add(new PseudoField(this, fieldtype(), pseudoFieldName));
	85	}
	86	}
	87	return _fields;
	88	}
79	89
80		public void setStartState(ComplexEObject parent)
81		{
82		((CompositeList) get(parent)).setStartState();
83		}
	90	public boolean hasFieldOfType(Class cls)
	91	{
	92	return firstFieldOfType(cls) != null;
	93	}
	94
	95	public Field firstFieldOfType(Class cls)
	96	{
	97	for (Field field : fields())
	98	{
	99	if (field.getJavaClass().equals(cls))
	100	{
	101	return field;
	102	}
	103	}
	104	return null;
	105	}
	106
	107	// ==
	108	public void setState(EObject parent, State state)
	109	{
	110	((CompositeList) get(parent)).setState(state);
	111	}
	112
	113	public void pushState(EObject parent, State state)
	114	{
	115	((CompositeList) get(parent)).pushState(state);
	116	}
	117
	118	public void popState(EObject parent)
	119	{
	120	((CompositeList) get(parent)).popState();
	121	}
	122
	123	public void setStartState(EObject parent)
	124	{
	125	((CompositeList) get(parent)).setStartState();
	126	}
	127
84	128
85	129	}

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/field/IndexedField.java

r1665	r1673
243	243	}
244	244
245		public EObject get(~~Complex~~EObject parent)
	245	public EObject get(EObject parent)
246	246	{
247	247	EObject eo = (EObject) reflectGet(parent);
…	…
250	250	}
251	251
252		public EView getView(~~Complex~~EObject parent)
	252	public EView getView(EObject parent)
253	253	{
254	254	AbstractListEO value = (AbstractListEO) get(parent);
…	…
257	257	}
258	258
259		public void set(~~Complex~~EObject parent, Object value)
	259	public void set(EObject parent, Object value)
260	260	{
261	261	if (value instanceof AbstractListEO)
…	…
274	274	}
275	275	}
276		public void restore(~~Complex~~EObject parent, Object value)
	276	public void restore(EObject parent, Object value)
277	277	{
278	278	AbstractListEO eo = (AbstractListEO) get(parent);
…	…
293	293
294	294
295		public int validate(~~Complex~~EObject parent)
	295	public int validate(EObject parent)
296	296	{
297	297	EObject value = get(parent);
…	…
308	308
309	309	// assume that one-many is associative, not aggregative/compositive
310		public void setState(~~Complex~~EObject parent, State state)
	310	public void setState(EObject parent, State state)
311	311	{
312	312	AbstractListEO leo = (AbstractListEO) get(parent);
…	…
322	322	}
323	323
324		public void pushState(~~Complex~~EObject parent, State state) { /* noop */ }
325		public void popState(~~Complex~~EObject parent) { /* noop */ }
326		public void setStartState(~~Complex~~EObject parent) { /* noop */ }
	324	public void pushState(EObject parent, State state) { /* noop */ }
	325	public void popState(EObject parent) { /* noop */ }
	326	public void setStartState(EObject parent) { /* noop */ }
327	327
328	328	private boolean _ordered;

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/find/FieldPath.java

r1665	r1673
8	8	import org.hibernate.HibernateException;
9	9	import org.hibernate.Session;
	10	import org.hibernate.criterion.Restrictions;
10	11	import com.u2d.element.Field;
11	12	import com.u2d.field.AssociationField;
	13	import com.u2d.field.PseudoField;
12	14	import com.u2d.type.atom.StringEO;
13	15	import com.u2d.model.AtomicRenderer;
…	…
107	109	subCriteria = subCriteria.createCriteria(field.getCleanPath());
108	110	}
	111	else if (node instanceof ComplexType.ChildListSearchNode)
	112	{
	113	field = ((ComplexType.ChildListSearchNode) node).getField();
	114	subCriteria = subCriteria.createCriteria(field.getCleanPath());
	115	subCriteria.add(Restrictions.eq("name", field.name()));
	116	}
109	117	}
110	118	return subCriteria;

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/list/CompositeList.java

r1665	r1673
13	13	import java.util.logging.Logger;
14	14	import java.util.Iterator;
	15	import java.util.List;
	16	import java.util.ArrayList;
15	17	import java.lang.reflect.Method;
16	18	import java.lang.reflect.InvocationTargetException;
…	…
20	22	import com.u2d.reflection.Cmd;
21	23	import com.u2d.element.CommandInfo;
	24	import com.u2d.find.Searchable;
22	25
23	26	/**
24	27	* @author Eitan Suez
25	28	*/
26		public class CompositeList extends SimpleListEO
	29	public class CompositeList extends SimpleListEO implements Searchable
27	30	{
28	31	private transient boolean _fixedSize = false;
…	…
212	215	}
213	216
	217	// hack
	218	private List emptyList = new ArrayList(0);
	219	public List getInequalities() { return emptyList; }
214	220	}

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/list/RelationalList.java

r1665	r1673
30	30	public Association association()
31	31	{
32		return ~~parentObject(~~).association(field().name());
	32	return ((ComplexEObject) parentObject()).association(field().name());
33	33	}
34	34	public void dissociate(ComplexEObject eo)

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/model/AbstractEObject.java

r1499	r1673
27	27
28	28	private Field _field = null;
29		private ~~Complex~~EObject _parent;
	29	private EObject _parent;
30	30
31		public void setField(Field field, ~~Complex~~EObject parent)
	31	public void setField(Field field, EObject parent)
32	32	{
33	33	_field = field;
…	…
35	35	}
36	36	public Field field() { return _field; }
37		public ~~Complex~~EObject parentObject() { return _parent; }
	37	public EObject parentObject() { return _parent; }
38	38
39	39	public abstract EObject makeCopy();

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/model/ComplexType.java

r1665	r1673
973	973	public Object getChild(Object parent, int index)
974	974	{
975		FieldParent fp = fieldParent(parent);
976		return searchFields(fp).get(index);
	975	return searchFields(parent).get(index);
977	976	}
978	977	public int getChildCount(Object parent)
979	978	{
980		FieldParent fp = fieldParent(parent);
981		return searchFields(fp).size();
	979	return searchFields(parent).size();
982	980	}
983	981	public boolean isLeaf(Object node)
…	…
1000	998	return true;
1001	999	}
	1000	else if (node instanceof ChildListSearchNode)
	1001	{
	1002	return false;
	1003	}
1002	1004
1003	1005	Field field = (Field) node;
1004		return (field.isAtomic() \|\| field.isIndexed() \|\| field.isAssociation() \|\| field.isChoice() );
	1006	return ( field.isAtomic() \|\| field.isAssociation() \|\| field.isChoice() \|\|
	1007	(field.isIndexed() && !field.isComposite()) );
1005	1008	}
1006	1009	// TreeModel implemented specifically for JComboTree, which doesn't employ these:
…	…
1014	1017	private Set<Field> _treeFields;
1015	1018
1016		private synchronized List searchFields(FieldParent fp)
1017		{
1018		if (searchFieldMap.get(fp) == null)
1019		{
1020		List searchFields = new ArrayList();
1021		if (fp instanceof ComplexType && ((ComplexType) fp).hasConcreteSubTypes())
	1019	private FieldParent fieldParent(Object parent)
	1020	{
	1021	if (parent instanceof AssociationSearchNode)
	1022	{
	1023	AssociationField field = ((AssociationSearchNode) parent).getField();
	1024	return field.fieldtype();
	1025	}
	1026	else if (parent instanceof ChildListSearchNode)
	1027	{
	1028	CompositeIndexedField field = ((ChildListSearchNode) parent).getField();
	1029	return field;
	1030	}
	1031	return (FieldParent) parent;
	1032	}
	1033	private synchronized List searchFields(Object parent)
	1034	{
	1035	if (searchFieldMap.get(parent) == null)
	1036	{
	1037	List searchFields = searchFieldsForFieldParent(fieldParent(parent));
	1038	searchFieldMap.put(parent, searchFields);
	1039	}
	1040	return (List) searchFieldMap.get(parent);
	1041	}
	1042
	1043	private List searchFieldsForFieldParent(FieldParent fp)
	1044	{
	1045	List searchFields = new ArrayList();
	1046	if (fp instanceof ComplexType && ((ComplexType) fp).hasConcreteSubTypes())
	1047	{
	1048	searchFields.add(fp);
	1049	}
	1050
	1051	Field field;
	1052	for (int i=0; i<fp.fields().size(); i++)
	1053	{
	1054	field = (Field) fp.fields().get(i);
	1055	if (!field.isSearchable())
	1056	continue;
	1057
	1058	if (field.isComposite() && field.isIndexed())
1022	1059	{
1023		searchFields.add(fp);
	1060	searchFields.add(new ChildListSearchNode((CompositeIndexedField) field));
1024	1061	}
1025
1026		Field field;
1027		for (int i=0; i<fp.fields().size(); i++)
	1062	else
1028	1063	{
1029		~~field = (Field) fp.fields().get(i);~~
1030		~~if (!field.isSearchable())~~
1031		~~continue;~~
1032
1033	1064	searchFields.add(field);
1034	1065	// add it a second time: (for drilling down to association's fields)
…	…
1044	1075	}
1045	1076	}
1046		searchFieldMap.put(fp, searchFields);
1047		}
1048		return (List) searchFieldMap.get(fp);
1049		}
1050		private FieldParent fieldParent(Object parent)
1051		{
1052		if (parent instanceof AssociationSearchNode)
1053		{
1054		AssociationField field = ((AssociationSearchNode) parent).getField();
1055		return field.fieldtype();
1056		}
1057		return (FieldParent) parent;
	1077	}
	1078	return searchFields;
1058	1079	}
1059	1080
…	…
1065	1086	public AssociationSearchNode(AssociationField field) { _field = field; }
1066	1087	public AssociationField getField() { return _field; }
	1088	public String toString() { return _field.toString(); }
	1089	}
	1090	public class ChildListSearchNode
	1091	{
	1092	CompositeIndexedField _field;
	1093	public ChildListSearchNode(CompositeIndexedField field) { _field = field; }
	1094	public CompositeIndexedField getField() { return _field; }
1067	1095	public String toString() { return _field.toString(); }
1068	1096	}

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/model/EObject.java

r541	r1673
25	25	public Onion commands();
26	26	public Onion filteredCommands();
27		public void setField(Field field, ~~Complex~~EObject parent);
	27	public void setField(Field field, EObject parent);
28	28	public Field field();
29	29
30		public ~~Complex~~EObject parentObject();
	30	public EObject parentObject();
31	31
32	32	public EObject makeCopy();

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/model/NullAssociation.java

r1337	r1673
24	24	public NullAssociation(RelationalList leo)
25	25	{
26		this(leo.field(), leo.parentObject());
	26	this(leo.field(), (ComplexEObject) leo.parentObject());
27	27	}
28	28

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/persist/HibernatePersistor.java

r1469	r1673
8	8	import com.u2d.model.ComplexType;
9	9	import com.u2d.model.AbstractListEO;
	10	import com.u2d.model.EObject;
10	11	import com.u2d.list.PlainListEObject;
11	12	import com.u2d.list.PagedList;
…	…
225	226	protected ComplexEObject selfOrParentIfAggregate(ComplexEObject ceo)
226	227	{
227		~~Complex~~EObject parent = ceo;
	228	EObject parent = ceo;
228	229	Field field = parent.field();
229	230	while ( (field != null) &&
…	…
235	236	field = parent.field();
236	237	}
237		return parent;
	238	return (ComplexEObject) parent;
238	239	}
239	240
…	…
311	312	public void invoke(Session session)
312	313	{
313		~~Complex~~EObject first = one;
	314	EObject first = one;
314	315	while (first.field() != null && first.field().isAggregate())
315	316	first = first.parentObject();

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/persist/MultiSessionPersistor.java

r1665	r1673
40	40
41	41	while (ceo.field() != null && ceo.field().isAggregate())
42		ceo = ceo.parentObject();
	42	ceo = (ComplexEObject) ceo.parentObject();
43	43
44	44	if (ceo.isTransientState())
…	…
79	79
80	80	while (one.field() != null && one.field().isAggregate())
81		one = one.parentObject();
	81	one = (ComplexEObject) one.parentObject();
82	82
83	83	session.saveOrUpdate(one);

jmatter-complet/branches/TRY-pseudofield/modules/echovm/src/com/u2d/view/echo/EchoViewMechanism.java

r1658	r1673
1	1	package com.u2d.view.echo;
2	2
3		import com.u2d.app.*;
	3	import com.u2d.app.ViewMechanism;
	4	import com.u2d.app.AppSession;
	5	import com.u2d.app.TypeRestrictionMgr;
	6	import com.u2d.app.RoleTypeRestrictionMgr;
4	7	import com.u2d.view.*;
5		~~import com.u2d.view.echo.list.ListView;~~
6	8	import com.u2d.ui.desktop.Positioning;
7	9	import com.u2d.wizard.details.Wizard;
…	…
20	22	import com.u2d.list.RelationalList;
21	23	import com.u2d.interaction.Instruction;
22		~~import nextapp.echo.app.Component;~~
23		~~import nextapp.echo.app.WindowPane;~~
24	24	//import com.u2d.app.Tracing;
25	25	//import java.util.logging.Logger;
…	…
80	80	}
81	81
82		public void displayViewFor(Object value, EView source, Positioning positioningHint)
83		{
84		if (value == null) return;
85
86		if (value instanceof Throwable)
87		{
88		// displayFrame(new ExceptionFrame((Throwable) value), positioningHint);
89		}
90		if (value instanceof Viewable)
91		{
92		EView view = ((Viewable) value).getMainView();
93
94		if (value instanceof ComplexEObject)
95		{
96		ComplexEObject ceo = (ComplexEObject) value;
97		if (ceo.isEditableState() && view instanceof Editor)
98		{
99		ceo.setEditor((Editor) view);
100		}
101		}
102
103		displayView(view, source);
104		}
105		else if (value instanceof EView)
106		{
107		displayView((EView) value, source);
108		}
109		else if (value instanceof View)
110		{
111		View view = (View) value;
112		displayView(view, positioningHint);
113		}
114		else if (value instanceof String)
115		{
116		message((String) value);
117		}
118		else if (value instanceof Reportable)
119		{
120		displayReport((Reportable) value);
121		}
122		else if (value instanceof Wizard)
123		{
124		displayWizard((Wizard) value);
125		}
126		else if (value instanceof Component)
127		{
128		Component component = (Component) value;
129		displayView(component, positioningHint);
130		}
	82	public void displayViewFor(Object object, EView eView, Positioning positioning)
	83	{
131	84	}
132	85
133	86	public void displayView(View view, Positioning positioning)
134	87	{
135		if (view instanceof WindowPane)
136		{
137		_appFrame.addFrame((WindowPane) view, positioning);
138		}
139		else
140		{
141		_appFrame.addFrame(new GenericFrame(view), positioning);
142		}
143		}
144
145		public void displayView(EView view, EView source)
146		{
147		_appFrame.addFrame(frameFor(view));
148		}
149
150		private WindowPane frameFor(EView view)
151		{
152		if (view instanceof WindowPane)
153		{
154		return (WindowPane) view;
155		}
156		if (view instanceof ListEView)
157		{
158		// return new FlexiFrame(new ListEOPanel(view));
159		return new FlexiFrame(view);
160		}
161		// else if (view instanceof CalendarView)
162		// {
163		// return new CalendarFrame(view);
164		// }
165		// else if (view instanceof ScheduleView)
166		// {
167		// return new CalendarFrame(view);
168		// }
169		else if (view instanceof ComplexEView)
170		{
171		// return new FlexiFrame(new EOPanel(view));
172		return new FlexiFrame(view);
173		}
174
175		throw new IllegalArgumentException(
176		"Don't know how to make a frame for view: "+view);
177		}
178
179		public void displayView(Component component, Positioning positioning)
180		{
181		_appFrame.addFrame(new FlexiFrame(component));
	88	}
	89
	90	public void displayView(EView eView, EView eView1)
	91	{
182	92	}
183	93
…	…
223	133	}
224	134
225		public ComplexEView getListItemView(ComplexEObject ceo)
226		{
227		checkState(ceo);
228		ListItemView view = new ListItemView();
229		view.bind(ceo);
230		return view;
	135	public ComplexEView getListItemView(ComplexEObject complexEObject)
	136	{
	137	return null;
231	138	}
232	139
…	…
391	298	public AtomicEditor getDegreeEditor() { return null; }
392	299
393		public AtomicRenderer getEmailRenderer() { return null; }
394		public AtomicEditor getEmailEditor() { return null; }
395
396		public AtomicRenderer getURIRenderer() { return null; }
397		public AtomicEditor getURIEditor() { return null; }
398
399		public AtomicRenderer getUSDollarRenderer() { return null; }
400		public AtomicEditor getUSDollarEditor() { return null; }
401		public AtomicRenderer getMoneyRenderer() { return null; }
402		public AtomicEditor getMoneyEditor() { return null; }
403
404		public AtomicRenderer getUSZipRenderer() { return null; }
405		public AtomicEditor getUSZipEditor() { return null; }
406
407		public AtomicRenderer getUSPhoneRenderer() { return null; }
408		public AtomicEditor getUSPhoneEditor() { return null; }
409
410		public AtomicRenderer getSSNRenderer() { return null; }
411		public AtomicEditor getSSNEditor() { return null; }
412
413		public AtomicRenderer getColorRenderer() { return null; }
414		public AtomicEditor getColorEditor() { return null; }
415
416		public AtomicRenderer getDateRenderer() { return null; }
417		public AtomicEditor getDateEditor() { return null; }
418
419		public AtomicRenderer getDateWithAgeRenderer() { return null; }
420		public AtomicEditor getDateWithAgeEditor() { return null; }
421
422		public AtomicRenderer getDateTimeRenderer() { return null; }
423		public AtomicEditor getDateTimeEditor() { return null; }
424
425		public AtomicRenderer getTimeRenderer() { return null; }
426		public AtomicEditor getTimeEditor() { return null; }
	300	public AtomicRenderer getEmailRenderer()
	301	{
	302	return null;
	303	}
	304
	305	public AtomicEditor getEmailEditor()
	306	{
	307	return null;
	308	}
	309
	310	public AtomicRenderer getURIRenderer()
	311	{
	312	return null;
	313	}
	314
	315	public AtomicEditor getURIEditor()
	316	{
	317	return null;
	318	}
	319
	320	public AtomicRenderer getUSDollarRenderer()
	321	{
	322	return null;
	323	}
	324
	325	public AtomicEditor getUSDollarEditor()
	326	{
	327	return null;
	328	}
	329
	330	public AtomicRenderer getMoneyRenderer()
	331	{
	332	return null;
	333	}
	334
	335	public AtomicEditor getMoneyEditor()
	336	{
	337	return null;
	338	}
	339
	340	public AtomicRenderer getUSZipRenderer()
	341	{
	342	return null;
	343	}
	344
	345	public AtomicEditor getUSZipEditor()
	346	{
	347	return null;
	348	}
	349
	350	public AtomicRenderer getUSPhoneRenderer()
	351	{
	352	return null;
	353	}
	354
	355	public AtomicEditor getUSPhoneEditor()
	356	{
	357	return null;
	358	}
	359
	360	public AtomicRenderer getSSNRenderer()
	361	{
	362	return null;
	363	}
	364
	365	public AtomicEditor getSSNEditor()
	366	{
	367	return null;
	368	}
	369
	370	public AtomicRenderer getColorRenderer()
	371	{
	372	return null;
	373	}
	374
	375	public AtomicEditor getColorEditor()
	376	{
	377	return null;
	378	}
	379
	380	public AtomicRenderer getDateRenderer()
	381	{
	382	return null;
	383	}
	384
	385	public AtomicEditor getDateEditor()
	386	{
	387	return null;
	388	}
	389
	390	public AtomicRenderer getDateWithAgeRenderer()
	391	{
	392	return null;
	393	}
	394
	395	public AtomicEditor getDateWithAgeEditor()
	396	{
	397	return null;
	398	}
	399
	400	public AtomicRenderer getDateTimeRenderer()
	401	{
	402	return null;
	403	}
	404
	405	public AtomicEditor getDateTimeEditor()
	406	{
	407	return null;
	408	}
	409
	410	public AtomicRenderer getTimeRenderer()
	411	{
	412	return null;
	413	}
	414
	415	public AtomicEditor getTimeEditor()
	416	{
	417	return null;
	418	}
427	419
428	420	public AtomicRenderer getTimeSpanRenderer()
…	…
476	468	}
477	469
478		public ListEView getListView(AbstractListEO ~~leo~~)
479		{
480		return n~~ew ListView(leo)~~;
481		}
482
483		public ListEView getListViewAsTable(AbstractListEO ~~leo~~)
484		{
485		return null;
486		}
487
488		public ListEView getListViewAsIcons(AbstractListEO ~~leo~~)
489		{
490		return null;
491		}
492
493		public ListEView getListViewAsTree(AbstractListEO ~~leo~~)
	470	public ListEView getListView(AbstractListEO abstractListEO)
	471	{
	472	return null;
	473	}
	474
	475	public ListEView getListViewAsTable(AbstractListEO abstractListEO)
	476	{
	477	return null;
	478	}
	479
	480	public ListEView getListViewAsIcons(AbstractListEO abstractListEO)
	481	{
	482	return null;
	483	}
	484
	485	public ListEView getListViewAsTree(AbstractListEO abstractListEO)
494	486	{
495	487	return null;
…	…
502	494	}
503	495
504		public ListEView getOmniListView(AbstractListEO ~~leo~~)
505		{
506		return null;
507		}
508
509		public ListEView getToolbarView(String string, AbstractListEO ~~leo~~)
510		{
511		return null;
512		}
513
514		public ListEView getRelationalListView(RelationalList list)
515		{
516		return null;
517		}
518
519		public ListEView getPickView(AbstractListEO ~~leo~~)
520		{
521		return null;
522		}
523
524		public View getMultiPickView(AbstractListEO ~~leo~~)
525		{
526		return null;
527		}
528
529		public ListEView getListViewMinimized(AbstractListEO ~~leo~~)
	496	public ListEView getOmniListView(AbstractListEO abstractListEO)
	497	{
	498	return null;
	499	}
	500
	501	public ListEView getToolbarView(String string, AbstractListEO abstractListEO)
	502	{
	503	return null;
	504	}
	505
	506	public ListEView getRelationalListView(RelationalList relationalList)
	507	{
	508	return null;
	509	}
	510
	511	public ListEView getPickView(AbstractListEO abstractListEO)
	512	{
	513	return null;
	514	}
	515
	516	public View getMultiPickView(AbstractListEO abstractListEO)
	517	{
	518	return null;
	519	}
	520
	521	public ListEView getListViewMinimized(AbstractListEO abstractListEO)
530	522	{
531	523	return null;
…	…
534	526	public ListEView getPaginableView(ListEView listEView)
535	527	{
536		// TODO: implement
537		// for now..
538		return listEView;
539		}
540
541		public ListEView getEditableListView(AbstractListEO leo)
542		{
543		return null;
544		}
545
546		public ListEView getExpandableListView(RelationalList list)
547		{
548		return null;
549		}
550
551		public ListEView getMultiChoiceView(AbstractListEO leo)
552		{
553		return null;
554		}
555
556		public ListEView getAlternateListView(AbstractListEO leo, String[] strings)
557		{
558		// for now short-circuit alternate views..
559		return getListView(leo);
	528	return null;
	529	}
	530
	531	public ListEView getEditableListView(AbstractListEO abstractListEO)
	532	{
	533	return null;
	534	}
	535
	536	public ListEView getExpandableListView(RelationalList relationalList)
	537	{
	538	return null;
	539	}
	540
	541	public ListEView getMultiChoiceView(AbstractListEO abstractListEO)
	542	{
	543	return null;
	544	}
	545
	546	public ListEView getAlternateListView(AbstractListEO abstractListEO, String[] strings)
	547	{
	548	return null;
560	549	}
561	550

jmatter-complet/branches/TRY-pseudofield/modules/swingvm/src/com/u2d/view/swing/StateCardPanel.java

r633	r1673
30	30	add((JComponent) _editView, "edit");
31	31
32		~~Complex~~EObject parentObject = getEObject().parentObject();
	32	EObject parentObject = getEObject().parentObject();
33	33	parentObject.addChangeListener(this);
34	34
35	35	// initialization..
36		show (~~parentObject~~.isEditableState() ? "edit" : "read");
	36	show (((ComplexEObject) parentObject).isEditableState() ? "edit" : "read");
37	37	}
38	38

jmatter-complet/branches/TRY-pseudofield/modules/swingvm/src/com/u2d/view/swing/SwingViewMechanism.java

r1658	r1673
224	224	ex.printStackTrace(new PrintWriter(sw));
225	225	String text = sw.toString();
226		JTextArea area = new JTextArea(text);
	226	JTextArea area = new JTextArea(text, 35, 130);
227	227	area.setEditable(false);
228	228	centerPane.add(new JScrollPane(area));
…	…
238	238	centerPane.add(okBtn, "alignx trailing, tag ok");
239	239	errorPane.add(centerPane);
	240	errorPane.setMaximumSize(new Dimension(800,600));
240	241	dlg.setContentPane(errorPane);
241	242	dlg.pack();

jmatter-complet/branches/TRY-pseudofield/modules/swingvm/src/com/u2d/view/swing/atom/AtomicView.java

r1606	r1673
90	90	if (_eo.parentObject() != null)
91	91	{
92		setEditable(~~_eo.parentObject(~~).isEditableState() && !_eo.field().isReadOnly()
93		&& !(((CompositeField) _eo.field()).isIdentity() && !~~_eo.parentObject(~~).isTransientState()) );
	92	setEditable(((ComplexEObject) _eo.parentObject()).isEditableState() && !_eo.field().isReadOnly()
	93	&& !(((CompositeField) _eo.field()).isIdentity() && !((ComplexEObject) _eo.parentObject()).isTransientState()) );
94	94	}
95	95	else
…	…
147	147	else
148	148	{
149		_renderer = field.getRenderer(_eo.parentObject());
	149	_renderer = field.getRenderer((ComplexEObject) _eo.parentObject());
150	150	if (field.hasValueOptions())
151	151	{
…	…
154	154	else
155	155	{
156		_editor = field.getEditor(_eo.parentObject());
	156	_editor = field.getEditor((ComplexEObject) _eo.parentObject());
157	157	}
158	158	}

jmatter-complet/branches/TRY-pseudofield/modules/swingvm/src/com/u2d/view/swing/atom/AtomicViewReadOnly.java

r1601	r1673
69	69	else
70	70	{
71		_renderer = field.getRenderer(_eo.parentObject());
	71	_renderer = field.getRenderer((ComplexEObject) _eo.parentObject());
72	72	}
73	73	}

jmatter-complet/branches/TRY-pseudofield/modules/swingvm/src/com/u2d/view/swing/dnd/RelationalListDropTarget.java

r1064	r1673
50	50	t.getTransferData(flavors[i]);
51	51	_leo.add(item);
52		if (!~~_leo.parentObject(~~).isEditableState())
53		~~_leo.parentObject(~~).save();
	52	if (!((ComplexEObject) _leo.parentObject()).isEditableState())
	53	((ComplexEObject) _leo.parentObject()).save();
54	54	break;
55	55	}

jmatter-complet/branches/TRY-pseudofield/modules/swingvm/src/com/u2d/view/swing/list/CompositeTableView.java

r1668	r1673
7	7	import com.u2d.list.CompositeList;
8	8	import com.u2d.model.EObject;
	9	import com.u2d.model.ComplexEObject;
9	10	import com.u2d.ui.IconButton;
10	11	import javax.swing.*;
…	…
161	162	if (_leo.parentObject() != null)
162	163	{
163		_addBtn.setEnabled(~~_leo.parentObject(~~).isEditableState());
	164	_addBtn.setEnabled(((ComplexEObject) _leo.parentObject()).isEditableState());
164	165	}
165	166	}

jmatter-complet/branches/TRY-pseudofield/modules/swingvm/src/com/u2d/view/swing/list/CompositeTabularView.java

r1445	r1673
145	145	CommandAdapter commandAdapter = new CommandAdapter(command, _leo, this);
146	146	_addBtn.addActionListener(commandAdapter); // want only actionPerformed(), not other features of action.
147		_addBtn.setEnabled(~~_leo.parentObject(~~).isEditableState());
	147	_addBtn.setEnabled(((ComplexEObject) _leo.parentObject()).isEditableState());
148	148	pnl.add(_addBtn);
149	149	return pnl;
…	…
199	199	if (_leo.parentObject() != null)
200	200	{
201		_addBtn.setEnabled(~~_leo.parentObject(~~).isEditableState());
	201	_addBtn.setEnabled(((ComplexEObject) _leo.parentObject()).isEditableState());
202	202	}
203	203	}
…	…
235	235	CompositeField cfield = ((CompositeField) field);
236	236	if (cfield.isReadOnly() \|\|
237		( cfield.isIdentity() && !~~_leo.parentObject(~~).isTransientState() )
	237	( cfield.isIdentity() && !((ComplexEObject) _leo.parentObject()).isTransientState() )
238	238	)
239	239	continue;
…	…
272	272	CompositeField cfield = ((CompositeField) field);
273	273	if (cfield.isReadOnly() \|\|
274		( cfield.isIdentity() && !~~_leo.parentObject(~~).isTransientState() )
	274	( cfield.isIdentity() && !((ComplexEObject) _leo.parentObject()).isTransientState() )
275	275	)
276	276	continue;

jmatter-complet/branches/TRY-pseudofield/modules/swingvm/src/com/u2d/view/swing/list/EditableListView.java

r1602	r1673
71	71	// contained listview component as a function of the number of children it contains.
72	72
73		if ( !~~_leo.parentObject(~~).isEditableState() && noEdit())
	73	if ( !((ComplexEObject) _leo.parentObject()).isEditableState() && noEdit())
74	74	{
75	75	setEditable(false);
…	…
79	79	private boolean noEdit()
80	80	{
81		Command editCmd = ~~_leo.parentObject().command("Edit", _leo.parentObject(~~).getState());
	81	Command editCmd = ((ComplexEObject) _leo.parentObject()).command("Edit", ((ComplexEObject) _leo.parentObject()).getState());
82	82	return editCmd == null \|\| _leo.currentUser().getRole().hasRestrictionOnCmd(editCmd);
83	83	}
…	…
188	188	public void run()
189	189	{
190		setEditable(~~_leo.parentObject(~~).isEditableState());
	190	setEditable(((ComplexEObject) _leo.parentObject()).isEditableState());
191	191	}
192	192	});

jmatter-complet/branches/TRY-pseudofield/modules/swingvm/src/com/u2d/view/swing/list/ExpandableView.java

r1438	r1673
5	5
6	6	import com.u2d.model.EObject;
	7	import com.u2d.model.ComplexEObject;
7	8	import com.u2d.ui.desktop.CloseableJInternalFrame;
8	9	import com.u2d.view.*;
…	…
39	40	{
40	41	return _leo.parentObject() != null &&
41		~~_leo.parentObject(~~).isEditableState();
	42	((ComplexEObject) _leo.parentObject()).isEditableState();
42	43	}
43	44

jmatter-complet/branches/TRY-pseudofield/modules/swingvm/src/com/u2d/view/swing/list/MultiPickView.java

r1438	r1673
62	62
63	63	list.addAll(_leo.getItems());
64		Association association = ~~_leo.parentObject(~~).association(_leo.field().name());
	64	Association association = ((ComplexEObject) _leo.parentObject()).association(_leo.field().name());
65	65	association.associateList(list);
66	66	}
…	…
70	70	AbstractListEO optionsList;
71	71
72		ComplexEObject parentObject = _leo.parentObject();
	72	ComplexEObject parentObject = (ComplexEObject) _leo.parentObject();
73	73	IndexedField listField = (IndexedField) _leo.field();
74	74	if (listField.hasListAssociationConstraint() && listField.associationOptions(parentObject) != null)

jmatter-complet/branches/TRY-pseudofield/modules/swingvm/src/com/u2d/view/swing/list/RelationalListView.java

r1416	r1673
34	34
35	35	// serves as a handle for creating/listing child items
36		NullAssociation nullEO = new NullAssociation(leo.field(), leo.parentObject());
	36	NullAssociation nullEO = new NullAssociation(leo.field(), (ComplexEObject) leo.parentObject());
37	37	_laview = new ListAssociationView(nullEO);
38	38	add(_laview);
…	…
85	85	public void run()
86	86	{
87		_trigger.setVisible(~~_leo.parentObject(~~).isEditableState());
	87	_trigger.setVisible(((ComplexEObject) _leo.parentObject()).isEditableState());
88	88	}
89	89	});

jmatter-complet/branches/TRY-pseudofield/modules/swingvm/src/com/u2d/view/swing/list/ReorderListView.java

r1493	r1673
205	205	_leo.remove(item);
206	206	_leo.add(spotIndex, item);
207		if (!~~_leo.parentObject(~~).isEditableState())
208		~~_leo.parentObject(~~).save();
	207	if (!((ComplexEObject) _leo.parentObject()).isEditableState())
	208	((ComplexEObject) _leo.parentObject()).save();
209	209	}
210	210	break;
…	…
214	214	ComplexEObject item = (ComplexEObject) t.getTransferData(flavor);
215	215	_leo.add(spotIndex, item);
216		if (!~~_leo.parentObject(~~).isEditableState())
217		~~_leo.parentObject(~~).save();
	216	if (!((ComplexEObject) _leo.parentObject()).isEditableState())
	217	((ComplexEObject) _leo.parentObject()).save();
218	218	break;
219	219	}

jmatter-complet/branches/TRY-pseudofield/modules/wingsvm/src/com/u2d/view/wings/list/ExpandableView.java

r285	r1673
5	5	import com.u2d.list.RelationalList;
6	6	import com.u2d.model.EObject;
	7	import com.u2d.model.ComplexEObject;
	8
7	9	import java.awt.event.*;
8	10	import javax.swing.ImageIcon;
…	…
38	40	{
39	41	return _leo.parentObject() != null &&
40		~~_leo.parentObject(~~).isEditableState();
	42	((ComplexEObject) _leo.parentObject()).isEditableState();
41	43	}
42	44

jmatter-complet/branches/TRY-pseudofield/test-app/src/class-list.json

r1477	r1673
9	9	"item-type": "com.u2d.model.ComplexType",
10	10	"items": [
	11	{ "value": "com.u2d.domain.Worker" },
11	12	{ "value": "com.u2d.domain.Painting" },
12	13	{ "value": "com.u2d.domain.Order" },

Navigation

Legend:

jmatter-complet/branches/TRY-pseudofield/JMatter.iws

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/element/Field.java

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/field/AggregateField.java

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/field/AssociationField.java

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/field/AtomicField.java

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/field/CompositeField.java

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/field/CompositeIndexedField.java

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/field/IndexedField.java

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/find/FieldPath.java

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/list/CompositeList.java

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/list/RelationalList.java

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/model/AbstractEObject.java

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/model/ComplexType.java

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/model/EObject.java

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/model/NullAssociation.java

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/persist/HibernatePersistor.java

jmatter-complet/branches/TRY-pseudofield/jmatter/src/com/u2d/persist/MultiSessionPersistor.java

jmatter-complet/branches/TRY-pseudofield/modules/echovm/src/com/u2d/view/echo/EchoViewMechanism.java

jmatter-complet/branches/TRY-pseudofield/modules/swingvm/src/com/u2d/view/swing/StateCardPanel.java

jmatter-complet/branches/TRY-pseudofield/modules/swingvm/src/com/u2d/view/swing/SwingViewMechanism.java

jmatter-complet/branches/TRY-pseudofield/modules/swingvm/src/com/u2d/view/swing/atom/AtomicView.java

jmatter-complet/branches/TRY-pseudofield/modules/swingvm/src/com/u2d/view/swing/atom/AtomicViewReadOnly.java

jmatter-complet/branches/TRY-pseudofield/modules/swingvm/src/com/u2d/view/swing/dnd/RelationalListDropTarget.java

jmatter-complet/branches/TRY-pseudofield/modules/swingvm/src/com/u2d/view/swing/list/CompositeTableView.java

jmatter-complet/branches/TRY-pseudofield/modules/swingvm/src/com/u2d/view/swing/list/CompositeTabularView.java

jmatter-complet/branches/TRY-pseudofield/modules/swingvm/src/com/u2d/view/swing/list/EditableListView.java

jmatter-complet/branches/TRY-pseudofield/modules/swingvm/src/com/u2d/view/swing/list/ExpandableView.java

jmatter-complet/branches/TRY-pseudofield/modules/swingvm/src/com/u2d/view/swing/list/MultiPickView.java

jmatter-complet/branches/TRY-pseudofield/modules/swingvm/src/com/u2d/view/swing/list/RelationalListView.java

jmatter-complet/branches/TRY-pseudofield/modules/swingvm/src/com/u2d/view/swing/list/ReorderListView.java

jmatter-complet/branches/TRY-pseudofield/modules/wingsvm/src/com/u2d/view/wings/list/ExpandableView.java

jmatter-complet/branches/TRY-pseudofield/test-app/src/class-list.json

Download in other formats: