Navigation

← Previous Changeset
Next Changeset →

Changeset 1474

Timestamp:

08/29/08 14:37:04 (3 years ago)

Author:

eitan

Message:

revised jmatter to no longer use jibx: removed libs, replaced .xml files with .json files; made appropriate code revisions to support this; removed commands 'export to xml'; added convenience command for lists 'export entire list to json' that pages; revised templates accordingly

Files:

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

jmatter-complet/branches/RM-JIBX/JMatter.iws

r1418	r1474
18	18	<list default="true" name="Default" comment="">
19	19	<change type="MODIFICATION" beforePath="/home/eitan/work/css4swing/test/com/u2d/css4swing/UnderstandSizing.java" afterPath="/home/eitan/work/css4swing/test/com/u2d/css4swing/UnderstandSizing.java" />
	20	<change type="DELETED" beforePath="$PROJECT_DIR$/jmatter/lib/tools/jibx-bind.jar" afterPath="" />
	21	<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/jmatter/resources/data/usstates.json" />
	22	<change type="DELETED" beforePath="$PROJECT_DIR$/jmatter/resources/data/sexes.xml" afterPath="" />
	23	<change type="DELETED" beforePath="$PROJECT_DIR$/jmatter/resources/project-template/src/class-list.xml" afterPath="" />
	24	<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/demo-apps/ContactMgr/src/class-list.json" />
20	25	<change type="MODIFICATION" beforePath="/home/eitan/work/css4swing/css4swing.iml" afterPath="/home/eitan/work/css4swing/css4swing.iml" />
	26	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/build.xml" afterPath="$PROJECT_DIR$/demo-apps/Sympster/build.xml" />
	27	<change type="MODIFICATION" beforePath="/home/eitan/work/css4swing/src/com/u2d/css4swing/StyleMenuBar.java" afterPath="/home/eitan/work/css4swing/src/com/u2d/css4swing/StyleMenuBar.java" />
	28	<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test-app/src/class-list.json" />
	29	<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/jmatter/resources/data/contactmethods.json" />
	30	<change type="DELETED" beforePath="$PROJECT_DIR$/demo-apps/Sympster/resources/binding.xml" afterPath="" />
	31	<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/jmatter/test/com/u2d/reporting/JFreeReportXMLParseTest.java" />
	32	<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/jmatter/resources/data/sexes.json" />
	33	<change type="DELETED" beforePath="$PROJECT_DIR$/jmatter/test/com/u2d/xml/JFreeReportXMLParseTest.java" afterPath="" />
	34	<change type="DELETED" beforePath="$PROJECT_DIR$/demo-apps/ContactMgr/src/class-list.xml" afterPath="" />
	35	<change type="DELETED" beforePath="$PROJECT_DIR$/AppBrowser/src/class-list.xml" afterPath="" />
	36	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/list/CriteriaListEO.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/list/CriteriaListEO.java" />
	37	<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/jmatter/test/com/u2d/reporting" />
	38	<change type="DELETED" beforePath="$PROJECT_DIR$/jmatter/resources/binding.xml" afterPath="" />
	39	<change type="DELETED" beforePath="$PROJECT_DIR$/jmatter/test/com/u2d/xml/MarshalAddressTest.java" afterPath="" />
	40	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/JMatter.iws" afterPath="$PROJECT_DIR$/JMatter.iws" />
	41	<change type="DELETED" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/xml/XMLPropertyAdapter.java" afterPath="" />
	42	<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AppBrowser/src/class-list.json" />
	43	<change type="DELETED" beforePath="$PROJECT_DIR$/demo-apps/IssueMgr/src/class-list.xml" afterPath="" />
21	44	<change type="MODIFICATION" beforePath="/home/eitan/work/css4swing/test/com/u2d/css4swing/SampleTest.java" afterPath="/home/eitan/work/css4swing/test/com/u2d/css4swing/SampleTest.java" />
22		<change type="MODIFICATION" beforePath="/home/eitan/work/css4swing/src/com/u2d/css4swing/StyleMenuBar.java" afterPath="/home/eitan/work/css4swing/src/com/u2d/css4swing/StyleMenuBar.java" />
	45	<change type="DELETED" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/xml/XMLExport.java" afterPath="" />
	46	<change type="DELETED" beforePath="$PROJECT_DIR$/demo-apps/Sympster/src/class-list.xml" afterPath="" />
	47	<change type="DELETED" beforePath="$PROJECT_DIR$/test-app/src/class-list.xml" afterPath="" />
	48	<change type="DELETED" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/xml/JibxBoiler.java" afterPath="" />
	49	<change type="DELETED" beforePath="$PROJECT_DIR$/jmatter/resources/data/usstates.xml" afterPath="" />
	50	<change type="DELETED" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/xml/ComplexTypeMarshaller.java" afterPath="" />
	51	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/resources/project-template/build-standalone.xml" afterPath="$PROJECT_DIR$/jmatter/resources/project-template/build-standalone.xml" />
	52	<change type="DELETED" beforePath="$PROJECT_DIR$/jmatter/lib/tools/bcel.jar" afterPath="" />
	53	<change type="DELETED" beforePath="$PROJECT_DIR$/demo-apps/Self/src/class-list.xml" afterPath="" />
	54	<change type="MOVED" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/xml/CodesList.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/json/CodesList.java" />
	55	<change type="DELETED" beforePath="$PROJECT_DIR$/demo-apps/MyTunes/resources/data/genres.xml" afterPath="" />
	56	<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/demo-apps/MyTunes/src/class-list.json" />
	57	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/Core.iml" afterPath="$PROJECT_DIR$/jmatter/Core.iml" />
	58	<change type="DELETED" beforePath="$PROJECT_DIR$/demo-apps/MyTunes/resources/binding.xml" afterPath="" />
	59	<change type="DELETED" beforePath="$PROJECT_DIR$/jmatter/test/com/u2d/xml/test.xml" afterPath="" />
	60	<change type="DELETED" beforePath="$PROJECT_DIR$/jmatter/test/com/u2d/xml" afterPath="" />
	61	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/MyTunes/src/com/u2d/mytunes/Application.java" afterPath="$PROJECT_DIR$/demo-apps/MyTunes/src/com/u2d/mytunes/Application.java" />
	62	<change type="DELETED" beforePath="$PROJECT_DIR$/demo-apps/Self/resources/binding.xml" afterPath="" />
	63	<change type="DELETED" beforePath="$PROJECT_DIR$/jmatter/lib/runtime/xpp3.jar" afterPath="" />
	64	<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/jmatter/test/com/u2d/reporting/test.xml" />
	65	<change type="DELETED" beforePath="$PROJECT_DIR$/demo-apps/IssueMgr/resources/binding.xml" afterPath="" />
	66	<change type="DELETED" beforePath="$PROJECT_DIR$/demo-apps/ContactMgr/resources/binding.xml" afterPath="" />
	67	<change type="DELETED" beforePath="$PROJECT_DIR$/jmatter/resources/project-template/resources/binding.xml" afterPath="" />
	68	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/build.xml" afterPath="$PROJECT_DIR$/jmatter/build.xml" />
23	69	<change type="MODIFICATION" beforePath="/home/eitan/work/css4swing/test/com/u2d/css4swing/SampleTest2.java" afterPath="/home/eitan/work/css4swing/test/com/u2d/css4swing/SampleTest2.java" />
24		<change type="MODIFICATION" beforePath="$PROJECT_DIR$/JMatter.iws" afterPath="$PROJECT_DIR$/JMatter.iws" />
	70	<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/demo-apps/Sympster/src/class-list.json" />
	71	<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/demo-apps/IssueMgr/src/class-list.json" />
	72	<change type="DELETED" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/xml" afterPath="" />
	73	<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/jmatter/resources/data/marritalstati.json" />
	74	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/resources/project-template/build.xml" afterPath="$PROJECT_DIR$/jmatter/resources/project-template/build.xml" />
	75	<change type="DELETED" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/xml/InterfaceMapper.java" afterPath="" />
	76	<change type="DELETED" beforePath="$PROJECT_DIR$/jmatter/resources/data/marritalstati.xml" afterPath="" />
	77	<change type="DELETED" beforePath="$PROJECT_DIR$/demo-apps/MyTunes/src/class-list.xml" afterPath="" />
	78	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/app/Application.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/app/Application.java" />
	79	<change type="DELETED" beforePath="$PROJECT_DIR$/jmatter/resources/data/contactmethods.xml" afterPath="" />
	80	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/json/JSON.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/json/JSON.java" />
	81	<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/demo-apps/Self/src/class-list.json" />
	82	<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/jmatter/resources/project-template/src/class-list.json" />
	83	<change type="DELETED" beforePath="$PROJECT_DIR$/jmatter/lib/runtime/jibx-run.jar" afterPath="" />
	84	<change type="DELETED" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/xml/Serializers.java" afterPath="" />
	85	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/model/AbstractComplexEObject.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/model/AbstractComplexEObject.java" />
	86	<change type="DELETED" beforePath="$PROJECT_DIR$/jmatter/lib/runtime/jibx-extras.jar" afterPath="" />
25	87	</list>
26	88	<ignored path="JMatter.iws" />
…	…
103	165	<property name="method_breakpoints_groupByClasses" value="true" />
104	166	<property name="exception_breakpoints_viewId" value="TABLE" />
	167	<property name="field_breakpoints_viewId" value="TABLE" />
105	168	<property name="exception_breakpoints_groupByClasses" value="true" />
106		~~<property name="field_breakpoints_viewId" value="TABLE" />~~
107	169	<property name="method_breakpoints_groupByMethods" value="false" />
108	170	</ui_properties>
…	…
147	209	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
148	210	</PATH_ELEMENT>
149		<PATH_ELEMENT>
150		<option name="myItemId" value="wingsvm" />
151		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
152		</PATH_ELEMENT>
153		</PATH>
154		<PATH>
155		<PATH_ELEMENT>
156		<option name="myItemId" value="JMatter" />
157		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
158		</PATH_ELEMENT>
159		<PATH_ELEMENT>
160		<option name="myItemId" value="wingsvm" />
161		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
162		</PATH_ELEMENT>
163		<PATH_ELEMENT>
164		<option name="myItemId" value="com.u2d.view.wings.list" />
	211	</PATH>
	212	<PATH>
	213	<PATH_ELEMENT>
	214	<option name="myItemId" value="JMatter" />
	215	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
	216	</PATH_ELEMENT>
	217	<PATH_ELEMENT>
	218	<option name="myItemId" value="test-app" />
	219	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
	220	</PATH_ELEMENT>
	221	</PATH>
	222	<PATH>
	223	<PATH_ELEMENT>
	224	<option name="myItemId" value="JMatter" />
	225	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
	226	</PATH_ELEMENT>
	227	<PATH_ELEMENT>
	228	<option name="myItemId" value="Sympster" />
	229	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
	230	</PATH_ELEMENT>
	231	</PATH>
	232	<PATH>
	233	<PATH_ELEMENT>
	234	<option name="myItemId" value="JMatter" />
	235	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
	236	</PATH_ELEMENT>
	237	<PATH_ELEMENT>
	238	<option name="myItemId" value="Sympster" />
	239	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
	240	</PATH_ELEMENT>
	241	<PATH_ELEMENT>
	242	<option name="myItemId" value="com.u2d.sympster" />
165	243	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
166	244	</PATH_ELEMENT>
…	…
172	250	</PATH_ELEMENT>
173	251	<PATH_ELEMENT>
174		<option name="myItemId" value="wingsvm" />
175		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
176		</PATH_ELEMENT>
177		<PATH_ELEMENT>
178		<option name="myItemId" value="com.u2d.view.wings.atom" />
179		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
180		</PATH_ELEMENT>
181		</PATH>
182		<PATH>
183		<PATH_ELEMENT>
184		<option name="myItemId" value="JMatter" />
185		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
186		</PATH_ELEMENT>
187		<PATH_ELEMENT>
188		<option name="myItemId" value="wingsvm" />
189		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
190		</PATH_ELEMENT>
191		<PATH_ELEMENT>
192		<option name="myItemId" value="com.u2d.view.wings" />
193		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
194		</PATH_ELEMENT>
195		</PATH>
196		<PATH>
197		<PATH_ELEMENT>
198		<option name="myItemId" value="JMatter" />
199		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
200		</PATH_ELEMENT>
201		<PATH_ELEMENT>
202		<option name="myItemId" value="test-app" />
203		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
204		</PATH_ELEMENT>
205		</PATH>
206		<PATH>
207		<PATH_ELEMENT>
208		<option name="myItemId" value="JMatter" />
209		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
210		</PATH_ELEMENT>
211		<PATH_ELEMENT>
212		<option name="myItemId" value="test-app" />
	252	<option name="myItemId" value="swingvm" />
	253	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
	254	</PATH_ELEMENT>
	255	</PATH>
	256	<PATH>
	257	<PATH_ELEMENT>
	258	<option name="myItemId" value="JMatter" />
	259	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
	260	</PATH_ELEMENT>
	261	<PATH_ELEMENT>
	262	<option name="myItemId" value="swingvm" />
213	263	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
214	264	</PATH_ELEMENT>
…	…
223	273	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
224	274	</PATH_ELEMENT>
225		</PATH>
226		<PATH>
227		<PATH_ELEMENT>
228		<option name="myItemId" value="JMatter" />
229		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
230		</PATH_ELEMENT>
231		<PATH_ELEMENT>
232		<option name="myItemId" value="swingvm" />
233		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
234		</PATH_ELEMENT>
235		</PATH>
236		<PATH>
237		<PATH_ELEMENT>
238		<option name="myItemId" value="JMatter" />
239		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
240		</PATH_ELEMENT>
241		<PATH_ELEMENT>
242		<option name="myItemId" value="swingvm" />
243		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
244		</PATH_ELEMENT>
245		<PATH_ELEMENT>
246		<option name="myItemId" value="com.u2d.wizard.ui" />
	275	<PATH_ELEMENT>
	276	<option name="myItemId" value="Self" />
	277	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
	278	</PATH_ELEMENT>
	279	</PATH>
	280	<PATH>
	281	<PATH_ELEMENT>
	282	<option name="myItemId" value="JMatter" />
	283	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
	284	</PATH_ELEMENT>
	285	<PATH_ELEMENT>
	286	<option name="myItemId" value="MyTunes" />
	287	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
	288	</PATH_ELEMENT>
	289	</PATH>
	290	<PATH>
	291	<PATH_ELEMENT>
	292	<option name="myItemId" value="JMatter" />
	293	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
	294	</PATH_ELEMENT>
	295	<PATH_ELEMENT>
	296	<option name="myItemId" value="MyTunes" />
	297	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
	298	</PATH_ELEMENT>
	299	<PATH_ELEMENT>
	300	<option name="myItemId" value="com.u2d.mytunes" />
247	301	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
248	302	</PATH_ELEMENT>
…	…
254	308	</PATH_ELEMENT>
255	309	<PATH_ELEMENT>
256		<option name="myItemId" value="swingvm" />
257		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
258		</PATH_ELEMENT>
259		<PATH_ELEMENT>
260		<option name="myItemId" value="com.u2d.view.swing.restrict" />
	310	<option name="myItemId" value="IssueMgr" />
	311	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
	312	</PATH_ELEMENT>
	313	</PATH>
	314	<PATH>
	315	<PATH_ELEMENT>
	316	<option name="myItemId" value="JMatter" />
	317	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
	318	</PATH_ELEMENT>
	319	<PATH_ELEMENT>
	320	<option name="myItemId" value="Core" />
	321	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
	322	</PATH_ELEMENT>
	323	</PATH>
	324	<PATH>
	325	<PATH_ELEMENT>
	326	<option name="myItemId" value="JMatter" />
	327	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
	328	</PATH_ELEMENT>
	329	<PATH_ELEMENT>
	330	<option name="myItemId" value="Core" />
	331	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
	332	</PATH_ELEMENT>
	333	<PATH_ELEMENT>
	334	<option name="myItemId" value="com.u2d.type" />
261	335	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
262		~~</PATH_ELEMENT>~~
263		~~</PATH>~~
264		~~<PATH>~~
265		~~<PATH_ELEMENT>~~
266		~~<option name="myItemId" value="JMatter" />~~
267		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />~~
268		~~</PATH_ELEMENT>~~
269		~~<PATH_ELEMENT>~~
270		~~<option name="myItemId" value="swingvm" />~~
271		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />~~
272		~~</PATH_ELEMENT>~~
273		~~<PATH_ELEMENT>~~
274		~~<option name="myItemId" value="com.u2d.view.swing.list" />~~
275		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />~~
276		~~</PATH_ELEMENT>~~
277		~~</PATH>~~
278		~~<PATH>~~
279		~~<PATH_ELEMENT>~~
280		~~<option name="myItemId" value="JMatter" />~~
281		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />~~
282		~~</PATH_ELEMENT>~~
283		~~<PATH_ELEMENT>~~
284		~~<option name="myItemId" value="swingvm" />~~
285		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />~~
286		~~</PATH_ELEMENT>~~
287		~~<PATH_ELEMENT>~~
288		~~<option name="myItemId" value="com.u2d.view.swing.find" />~~
289		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />~~
290		~~</PATH_ELEMENT>~~
291		~~</PATH>~~
292		~~<PATH>~~
293		~~<PATH_ELEMENT>~~
294		~~<option name="myItemId" value="JMatter" />~~
295		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />~~
296		~~</PATH_ELEMENT>~~
297		~~<PATH_ELEMENT>~~
298		~~<option name="myItemId" value="swingvm" />~~
299		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />~~
300		~~</PATH_ELEMENT>~~
301		~~<PATH_ELEMENT>~~
302		~~<option name="myItemId" value="com.u2d.view.swing.calendar.fancy" />~~
303		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />~~
304		~~</PATH_ELEMENT>~~
305		~~</PATH>~~
306		~~<PATH>~~
307		~~<PATH_ELEMENT>~~
308		~~<option name="myItemId" value="JMatter" />~~
309		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />~~
310		~~</PATH_ELEMENT>~~
311		~~<PATH_ELEMENT>~~
312		~~<option name="myItemId" value="swingvm" />~~
313		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />~~
314		~~</PATH_ELEMENT>~~
315		~~<PATH_ELEMENT>~~
316		~~<option name="myItemId" value="com.u2d.view.swing.calendar" />~~
317		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />~~
318		~~</PATH_ELEMENT>~~
319		~~</PATH>~~
320		~~<PATH>~~
321		~~<PATH_ELEMENT>~~
322		~~<option name="myItemId" value="JMatter" />~~
323		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />~~
324		~~</PATH_ELEMENT>~~
325		~~<PATH_ELEMENT>~~
326		~~<option name="myItemId" value="swingvm" />~~
327		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />~~
328		~~</PATH_ELEMENT>~~
329		~~<PATH_ELEMENT>~~
330		~~<option name="myItemId" value="com.u2d.view.swing.atom" />~~
331		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />~~
332		~~</PATH_ELEMENT>~~
333		~~</PATH>~~
334		~~<PATH>~~
335		~~<PATH_ELEMENT>~~
336		~~<option name="myItemId" value="JMatter" />~~
337		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />~~
338		~~</PATH_ELEMENT>~~
339		~~<PATH_ELEMENT>~~
340		~~<option name="myItemId" value="swingvm" />~~
341		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />~~
342		~~</PATH_ELEMENT>~~
343		~~<PATH_ELEMENT>~~
344		~~<option name="myItemId" value="com.u2d.view.swing" />~~
345		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />~~
346		~~</PATH_ELEMENT>~~
347		~~</PATH>~~
348		~~<PATH>~~
349		~~<PATH_ELEMENT>~~
350		~~<option name="myItemId" value="JMatter" />~~
351		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />~~
352		~~</PATH_ELEMENT>~~
353		~~<PATH_ELEMENT>~~
354		~~<option name="myItemId" value="swingvm" />~~
355		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />~~
356		~~</PATH_ELEMENT>~~
357		~~<PATH_ELEMENT>~~
358		~~<option name="myItemId" value="com.u2d.tools" />~~
359		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />~~
360		~~</PATH_ELEMENT>~~
361		~~</PATH>~~
362		~~<PATH>~~
363		~~<PATH_ELEMENT>~~
364		~~<option name="myItemId" value="JMatter" />~~
365		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />~~
366		~~</PATH_ELEMENT>~~
367		~~<PATH_ELEMENT>~~
368		~~<option name="myItemId" value="echo2vm" />~~
369		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />~~
370		~~</PATH_ELEMENT>~~
371		~~</PATH>~~
372		~~<PATH>~~
373		~~<PATH_ELEMENT>~~
374		~~<option name="myItemId" value="JMatter" />~~
375		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />~~
376		~~</PATH_ELEMENT>~~
377		~~<PATH_ELEMENT>~~
378		~~<option name="myItemId" value="echo2vm" />~~
379		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />~~
380		~~</PATH_ELEMENT>~~
381		~~<PATH_ELEMENT>~~
382		~~<option name="myItemId" value="com.u2d.view.echo2" />~~
383		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />~~
384		~~</PATH_ELEMENT>~~
385		~~</PATH>~~
386		~~<PATH>~~
387		~~<PATH_ELEMENT>~~
388		~~<option name="myItemId" value="JMatter" />~~
389		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />~~
390		~~</PATH_ELEMENT>~~
391		~~<PATH_ELEMENT>~~
392		~~<option name="myItemId" value="ds-swing" />~~
393		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />~~
394		~~</PATH_ELEMENT>~~
395		~~</PATH>~~
396		~~<PATH>~~
397		~~<PATH_ELEMENT>~~
398		~~<option name="myItemId" value="JMatter" />~~
399		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />~~
400		~~</PATH_ELEMENT>~~
401		~~<PATH_ELEMENT>~~
402		~~<option name="myItemId" value="ds-swing" />~~
403		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />~~
404		~~</PATH_ELEMENT>~~
405		~~<PATH_ELEMENT>~~
406		~~<option name="myItemId" value="com.u2d.ui" />~~
407		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />~~
408		~~</PATH_ELEMENT>~~
409		~~</PATH>~~
410		~~<PATH>~~
411		~~<PATH_ELEMENT>~~
412		~~<option name="myItemId" value="JMatter" />~~
413		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />~~
414		~~</PATH_ELEMENT>~~
415		~~<PATH_ELEMENT>~~
416		~~<option name="myItemId" value="css4swing" />~~
417		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />~~
418		~~</PATH_ELEMENT>~~
419		~~</PATH>~~
420		~~<PATH>~~
421		~~<PATH_ELEMENT>~~
422		~~<option name="myItemId" value="JMatter" />~~
423		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />~~
424		~~</PATH_ELEMENT>~~
425		~~<PATH_ELEMENT>~~
426		~~<option name="myItemId" value="css4swing" />~~
427		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />~~
428		~~</PATH_ELEMENT>~~
429		~~<PATH_ELEMENT>~~
430		~~<option name="myItemId" value="com.u2d.css4swing" />~~
431		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />~~
432		~~</PATH_ELEMENT>~~
433		~~</PATH>~~
434		~~<PATH>~~
435		~~<PATH_ELEMENT>~~
436		~~<option name="myItemId" value="JMatter" />~~
437		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />~~
438		~~</PATH_ELEMENT>~~
439		~~<PATH_ELEMENT>~~
440		~~<option name="myItemId" value="Core" />~~
441		~~<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />~~
442	336	</PATH_ELEMENT>
443	337	</PATH>
…	…
462	356	</PATH_ELEMENT>
463	357	<PATH_ELEMENT>
464		<option name="myItemId" value="AppBrowser" />
465		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
466		</PATH_ELEMENT>
467		<PATH_ELEMENT>
468		<option name="myItemId" value="Libraries" />
469		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewLibrariesNode" />
470		</PATH_ELEMENT>
471		</PATH>
472		<PATH>
473		<PATH_ELEMENT>
474		<option name="myItemId" value="JMatter" />
475		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
476		</PATH_ELEMENT>
477		<PATH_ELEMENT>
478		<option name="myItemId" value="AppBrowser" />
479		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
480		</PATH_ELEMENT>
481		<PATH_ELEMENT>
482		<option name="myItemId" value="Libraries" />
483		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewLibrariesNode" />
484		</PATH_ELEMENT>
485		<PATH_ELEMENT>
486		<option name="myItemId" value="PsiDirectory:/usr/lib/jvm/java-6-sun/jre/lib/rt.jar!/java/awt" />
487		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
	358	<option name="myItemId" value="Core" />
	359	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
	360	</PATH_ELEMENT>
	361	<PATH_ELEMENT>
	362	<option name="myItemId" value="com.u2d.list" />
	363	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
	364	</PATH_ELEMENT>
	365	</PATH>
	366	<PATH>
	367	<PATH_ELEMENT>
	368	<option name="myItemId" value="JMatter" />
	369	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
	370	</PATH_ELEMENT>
	371	<PATH_ELEMENT>
	372	<option name="myItemId" value="Core" />
	373	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
	374	</PATH_ELEMENT>
	375	<PATH_ELEMENT>
	376	<option name="myItemId" value="com.u2d.json" />
	377	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
	378	</PATH_ELEMENT>
	379	</PATH>
	380	<PATH>
	381	<PATH_ELEMENT>
	382	<option name="myItemId" value="JMatter" />
	383	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
	384	</PATH_ELEMENT>
	385	<PATH_ELEMENT>
	386	<option name="myItemId" value="Core" />
	387	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
	388	</PATH_ELEMENT>
	389	<PATH_ELEMENT>
	390	<option name="myItemId" value="com.u2d.element" />
	391	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
	392	</PATH_ELEMENT>
	393	</PATH>
	394	<PATH>
	395	<PATH_ELEMENT>
	396	<option name="myItemId" value="JMatter" />
	397	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
	398	</PATH_ELEMENT>
	399	<PATH_ELEMENT>
	400	<option name="myItemId" value="Core" />
	401	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
	402	</PATH_ELEMENT>
	403	<PATH_ELEMENT>
	404	<option name="myItemId" value="com.u2d.app" />
	405	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
	406	</PATH_ELEMENT>
	407	</PATH>
	408	<PATH>
	409	<PATH_ELEMENT>
	410	<option name="myItemId" value="JMatter" />
	411	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
	412	</PATH_ELEMENT>
	413	<PATH_ELEMENT>
	414	<option name="myItemId" value="ContactMgr" />
	415	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
488	416	</PATH_ELEMENT>
489	417	</PATH>
…	…
572	500	<property name="MemberChooser.sorted" value="false" />
573	501	<property name="TEMP_MODULE_EXPLODED_DIR_FOR_Sympster/web/Web3" value="/tmp/webExplodedDir56735tmp" />
	502	<property name="last_opened_file_path" value="$PROJECT_DIR$/demo-apps/MovieLib/src" />
574	503	<property name="TEMP_MODULE_EXPLODED_DIR_FOR_Sympster/web/Web2" value="/tmp/webExplodedDir56734tmp" />
575	504	<property name="TEMP_MODULE_EXPLODED_DIR_FOR_ContactMgr/web/Web" value="/tmp/webExplodedDir56729tmp" />
	505	<property name="TEMP_MODULE_EXPLODED_DIR_FOR_MyTunes/web/Web" value="/private/tmp/webExplodedDir7160tmp" />
576	506	<property name="GoToClass.includeJavaFiles" value="false" />
577		~~<property name="TEMP_MODULE_EXPLODED_DIR_FOR_MyTunes/web/Web" value="/private/tmp/webExplodedDir7160tmp" />~~
578	507	<property name="MemberChooser.copyJavadoc" value="false" />
579	508	<property name="TEMP_MODULE_EXPLODED_DIR_FOR_IssueMgr/web/Web" value="/tmp/webExplodedDir9433tmp" />
…	…
593	522	</key>
594	523	<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
	524	<recent name="com.u2d.json" />
	525	<recent name="com.u2d.reporting" />
595	526	<recent name="com.u2d.view.swing" />
596	527	<recent name="com.u2d.contactmgr" />
…	…
620	551	</method>
621	552	</tempConfiguration>
	553	<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
	554	<option name="MAIN_CLASS_NAME" />
	555	<option name="VM_PARAMETERS" />
	556	<option name="PROGRAM_PARAMETERS" />
	557	<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
	558	<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
	559	<option name="ALTERNATIVE_JRE_PATH" />
	560	<option name="ENABLE_SWING_INSPECTOR" value="false" />
	561	<option name="ENV_VARIABLES" />
	562	<option name="PASS_PARENT_ENVS" value="true" />
	563	<module name="" />
	564	<envs />
	565	<method>
	566	<option name="Make" value="true" />
	567	</method>
	568	</configuration>
622	569	<configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
623	570	<module name="" />
…	…
637	584	<value defaultName="wholeProject" />
638	585	</option>
639		~~<envs />~~
640		~~<method>~~
641		~~<option name="Make" value="true" />~~
642		~~</method>~~
643		~~</configuration>~~
644		~~<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">~~
645		~~<option name="MAIN_CLASS_NAME" />~~
646		~~<option name="VM_PARAMETERS" />~~
647		~~<option name="PROGRAM_PARAMETERS" />~~
648		~~<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />~~
649		~~<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />~~
650		~~<option name="ALTERNATIVE_JRE_PATH" />~~
651		~~<option name="ENABLE_SWING_INSPECTOR" value="false" />~~
652		~~<option name="ENV_VARIABLES" />~~
653		~~<option name="PASS_PARENT_ENVS" value="true" />~~
654		~~<module name="" />~~
655	586	<envs />
656	587	<method>
…	…
958	889	</component>
959	890	<component name="ToolWindowManager">
960		<frame x="0" y="25" width="1440" height="850" extended-state="1" />
	891	<frame x="0" y="25" width="1440" height="850" extended-state="0" />
961	892	<editor active="true" />
962	893	<layout>
…	…
965	896	<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="6" />
966	897	<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24658519" order="1" />
967		<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33~~88203~~" order="1" />
	898	<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33744857" order="1" />
968	899	<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.43484226" order="3" />
969	900	<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="14" />
…	…
974	905	<window_info id="JProfiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32921812" order="10" />
975	906	<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="5" />
976		<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25~~668836~~" order="0" />
	907	<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2559653" order="0" />
977	908	<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="11" />
978		<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.249~~81897~~" order="2" />
	909	<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24946082" order="2" />
979	910	<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" />
980	911	<window_info id="Duplicates" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="13" />
…	…
1144	1075	</component>
1145	1076	<component name="editorHistoryManager">
1146		<entry file="file://$PROJECT_DIR$/modules/wingsvm/src/com/u2d/view/wings/atom/CommandsButtonView.java">
1147		<provider selected="true" editor-type-id="text-editor">
1148		<state line="51" column="43" selection-start="1401" selection-end="1401" vertical-scroll-proportion="0.3317757">
1149		<folding />
1150		</state>
1151		</provider>
1152		</entry>
1153		<entry file="file://$PROJECT_DIR$/modules/wingsvm/src/com/u2d/view/wings/list/EditableListView.java">
1154		<provider selected="true" editor-type-id="text-editor">
1155		<state line="44" column="25" selection-start="1160" selection-end="1160" vertical-scroll-proportion="0.33333334">
1156		<folding />
1157		</state>
1158		</provider>
1159		</entry>
1160		<entry file="file://$PROJECT_DIR$/modules/wingsvm/src/com/u2d/view/wings/list/ExpandableView.java">
1161		<provider selected="true" editor-type-id="text-editor">
1162		<state line="60" column="18" selection-start="1447" selection-end="1447" vertical-scroll-proportion="0.33333334">
1163		<folding />
1164		</state>
1165		</provider>
1166		</entry>
1167		<entry file="file://$PROJECT_DIR$/modules/wingsvm/src/com/u2d/view/wings/list/ListEOFrame.java">
1168		<provider selected="true" editor-type-id="text-editor">
1169		<state line="39" column="38" selection-start="1144" selection-end="1144" vertical-scroll-proportion="0.33333334">
1170		<folding />
1171		</state>
1172		</provider>
1173		</entry>
1174		<entry file="file://$PROJECT_DIR$/test-app/src/com/u2d/view/swing/GradientBar.java">
1175		<provider selected="true" editor-type-id="text-editor">
1176		<state line="39" column="31" selection-start="965" selection-end="965" vertical-scroll-proportion="0.5469484">
1177		<folding />
1178		</state>
1179		</provider>
1180		</entry>
1181		<entry file="file://$PROJECT_DIR$/test-app/src/com/u2d/view/swing/ViewTester.java">
1182		<provider selected="true" editor-type-id="text-editor">
1183		<state line="35" column="15" selection-start="987" selection-end="987" vertical-scroll-proportion="0.33333334">
1184		<folding />
1185		</state>
1186		</provider>
1187		</entry>
1188		<entry file="file:///home/eitan/work/css4swing/src/com/u2d/css4swing/StyleMenuBar.java">
1189		<provider selected="true" editor-type-id="text-editor">
1190		<state line="94" column="33" selection-start="2798" selection-end="2798" vertical-scroll-proportion="0.21203439">
1191		<folding />
1192		</state>
1193		</provider>
1194		</entry>
1195		<entry file="file:///home/eitan/work/css4swing/test/com/u2d/css4swing/UnderstandSizing.java">
1196		<provider selected="true" editor-type-id="text-editor">
1197		<state line="129" column="41" selection-start="3774" selection-end="3774" vertical-scroll-proportion="0.6561605">
1198		<folding />
1199		</state>
1200		</provider>
1201		</entry>
1202		<entry file="file:///home/eitan/work/css4swing/test/com/u2d/css4swing/SampleTest.java">
1203		<provider selected="true" editor-type-id="text-editor">
1204		<state line="277" column="26" selection-start="11464" selection-end="11464" vertical-scroll-proportion="0.16905445">
1205		<folding />
1206		</state>
1207		</provider>
1208		</entry>
1209		<entry file="file://$PROJECT_DIR$/modules/ds-swing/src/com/u2d/ui/MessagePanel.java">
1210		<provider selected="true" editor-type-id="text-editor">
1211		<state line="17" column="3" selection-start="438" selection-end="438" vertical-scroll-proportion="0.32234958">
1212		<folding />
1213		</state>
1214		</provider>
1215		</entry>
1216		<entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/model/ComplexType.java">
1217		<provider selected="true" editor-type-id="text-editor">
1218		<state line="95" column="51" selection-start="2600" selection-end="2606" vertical-scroll-proportion="0.3323782">
1219		<folding />
1220		</state>
1221		</provider>
1222		</entry>
1223		<entry file="file://$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/FormView.java">
1224		<provider selected="true" editor-type-id="text-editor">
1225		<state line="136" column="0" selection-start="3725" selection-end="3725" vertical-scroll-proportion="0.8710602">
1226		<folding />
1227		</state>
1228		</provider>
1229		</entry>
1230		<entry file="file://$PROJECT_DIR$/modules/echo2vm/src/com/u2d/view/echo2/AppFrame.java">
1231		<provider selected="true" editor-type-id="text-editor">
1232		<state line="143" column="3" selection-start="4025" selection-end="4025" vertical-scroll-proportion="0.82808024">
1233		<folding />
1234		</state>
1235		</provider>
1236		</entry>
1237		<entry file="file://$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/AppFrame.java">
1238		<provider selected="true" editor-type-id="text-editor">
1239		<state line="175" column="0" selection-start="5648" selection-end="5648" vertical-scroll-proportion="0.95702004">
1240		<folding>
1241		<element signature="imports" expanded="true" />
1242		</folding>
1243		</state>
1244		</provider>
1245		</entry>
1246		<entry file="jar:///usr/lib/jvm/java-6-sun/src.zip!/java/awt/FlowLayout.java">
1247		<provider selected="true" editor-type-id="text-editor">
1248		<state line="72" column="7" selection-start="2207" selection-end="2207" vertical-scroll-proportion="0.24641834">
1249		<folding />
1250		</state>
1251		</provider>
1252		</entry>
1253		<entry file="file://$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/HorizScrollpane.java">
1254		<provider selected="true" editor-type-id="text-editor">
1255		<state line="0" column="21" selection-start="21" selection-end="21" vertical-scroll-proportion="0.0">
1256		<folding>
1257		<element signature="imports" expanded="true" />
1258		</folding>
	1077	<entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/json/JSON.java">
	1078	<provider selected="true" editor-type-id="text-editor">
	1079	<state line="81" column="0" selection-start="2372" selection-end="2372" vertical-scroll-proportion="0.6486091">
	1080	<folding />
	1081	</state>
	1082	</provider>
	1083	</entry>
	1084	<entry file="file://$PROJECT_DIR$/demo-apps/MyTunes/src/com/u2d/mytunes/Application.java">
	1085	<provider selected="true" editor-type-id="text-editor">
	1086	<state line="17" column="0" selection-start="345" selection-end="345" vertical-scroll-proportion="0.3653295">
	1087	<folding />
	1088	</state>
	1089	</provider>
	1090	</entry>
	1091	<entry file="file://$PROJECT_DIR$/jmatter/resources/project-template/src/class-list.json">
	1092	<provider selected="true" editor-type-id="text-editor">
	1093	<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
	1094	<folding />
	1095	</state>
	1096	</provider>
	1097	</entry>
	1098	<entry file="file://$PROJECT_DIR$/demo-apps/Sympster/src/class-list.json">
	1099	<provider selected="true" editor-type-id="text-editor">
	1100	<state line="15" column="47" selection-start="0" selection-end="1078" vertical-scroll-proportion="0.32234958">
	1101	<folding />
	1102	</state>
	1103	</provider>
	1104	</entry>
	1105	<entry file="file://$PROJECT_DIR$/demo-apps/MovieLib/src/class-list.json">
	1106	<provider selected="true" editor-type-id="text-editor">
	1107	<state line="15" column="1" selection-start="515" selection-end="515" vertical-scroll-proportion="0.33088234">
	1108	<folding />
	1109	</state>
	1110	</provider>
	1111	</entry>
	1112	<entry file="file://$PROJECT_DIR$/demo-apps/CustomUI/src/class-list.json">
	1113	<provider selected="true" editor-type-id="text-editor">
	1114	<state line="16" column="0" selection-start="495" selection-end="495" vertical-scroll-proportion="0.34383956">
	1115	<folding />
	1116	</state>
	1117	</provider>
	1118	</entry>
	1119	<entry file="file://$PROJECT_DIR$/demo-apps/Self/src/class-list.json">
	1120	<provider selected="true" editor-type-id="text-editor">
	1121	<state line="18" column="7" selection-start="551" selection-end="551" vertical-scroll-proportion="0.38681948">
	1122	<folding />
	1123	</state>
	1124	</provider>
	1125	</entry>
	1126	<entry file="file://$PROJECT_DIR$/demo-apps/ContactMgr/src/class-list.json">
	1127	<provider selected="true" editor-type-id="text-editor">
	1128	<state line="29" column="7" selection-start="922" selection-end="922" vertical-scroll-proportion="0.6232092">
	1129	<folding />
	1130	</state>
	1131	</provider>
	1132	</entry>
	1133	<entry file="file://$PROJECT_DIR$/demo-apps/MyTunes/src/class-list.json">
	1134	<provider selected="true" editor-type-id="text-editor">
	1135	<state line="20" column="4" selection-start="604" selection-end="604" vertical-scroll-proportion="0.42979944">
	1136	<folding />
	1137	</state>
	1138	</provider>
	1139	</entry>
	1140	<entry file="file://$PROJECT_DIR$/demo-apps/IssueMgr/src/class-list.json">
	1141	<provider selected="true" editor-type-id="text-editor">
	1142	<state line="16" column="0" selection-start="493" selection-end="493" vertical-scroll-proportion="0.34383956">
	1143	<folding />
	1144	</state>
	1145	</provider>
	1146	</entry>
	1147	<entry file="file://$PROJECT_DIR$/AppBrowser/src/class-list.json">
	1148	<provider selected="true" editor-type-id="text-editor">
	1149	<state line="14" column="0" selection-start="337" selection-end="337" vertical-scroll-proportion="0.3008596">
	1150	<folding />
	1151	</state>
	1152	</provider>
	1153	</entry>
	1154	<entry file="file://$PROJECT_DIR$/test-app/src/class-list.json">
	1155	<provider selected="true" editor-type-id="text-editor">
	1156	<state line="6" column="0" selection-start="131" selection-end="131" vertical-scroll-proportion="0.12893982">
	1157	<folding />
	1158	</state>
	1159	</provider>
	1160	</entry>
	1161	<entry file="file://$PROJECT_DIR$/test-app/src/class-list.xml">
	1162	<provider selected="true" editor-type-id="text-editor">
	1163	<state line="7" column="0" selection-start="146" selection-end="553" vertical-scroll-proportion="0.15463917">
	1164	<folding />
1259	1165	</state>
1260	1166	</provider>

jmatter-complet/branches/RM-JIBX/demo-apps/MyTunes/src/com/u2d/mytunes/Application.java

r330	r1474
1	1	package com.u2d.mytunes;
2	2
3		import com.u2d.~~xml~~.CodesList;
	3	import com.u2d.json.CodesList;
4	4
5	5	/**
…	…
14	14	{
15	15	super.initialize();
16		~~// CodesList.populateItemsFor(_pmech, Genre.class, "genres.xml");~~
17	16	CodesList.populateItemsFor(_pmech, Genre.class, "genres.json");
18	17	}

jmatter-complet/branches/RM-JIBX/demo-apps/Sympster/build.xml

r1451	r1474
87	87	<fileset dir="resources" includes="model-metadata.properties" />
88	88	<fileset dir="resources" includes="styles.css" />
89		<fileset dir="resources/data" includes=".~~xml,.~~json" /> <!-- codes files -->
	89	<fileset dir="resources/data" includes="*.json" /> <!-- codes files -->
90	90	<!-- <fileset dir="resources" includes="log4j.properties" /> -->
91		<fileset dir="${src.dir}" includes="*/.xml,*/.jasper,*/.jfrm" />
	91	<fileset dir="${src.dir}" includes="*/.xml,*/.json,*/.jasper,*/.jfrm" />
92	92	<fileset dir="${src.dir}" includes="*/.gif,*/.png" /> <!-- any images referenced by jfree report xmls -->
93	93	</copy>
…	…
99	99
100	100	<target name="compile-framework">
101		<ant antfile="${framework.dir}/build.xml" inheritAll="false" target="~~bind~~" />
	101	<ant antfile="${framework.dir}/build.xml" inheritAll="false" target="compile" />
102	102	</target>
103	103
…	…
204	204	</target>
205	205
206		<target name="genhbm" depends="~~bind~~" description="generate hbm.xml files">
	206	<target name="genhbm" depends="compile" description="generate hbm.xml files">
207	207	<java classpathref="class.path" dir="${build.classes.dir}"
208	208	fork="true" classname="com.u2d.persist.HBMGenerator" />
209	209	</target>
210	210
211
212		~~<!-- JiBX - related -->~~
213
214		~~<!-- JiBX binding compiler task definition -->~~
215		~~<taskdef name="bind" classname="org.jibx.binding.ant.CompileTask">~~
216		~~<classpath>~~
217		~~<pathelement location="${lib.tools.dir}/bcel.jar" />~~
218		~~<pathelement location="${lib.tools.dir}/jibx-bind.jar" />~~
219		~~<pathelement location="${lib.dir}/jibx-run.jar" />~~
220		~~<pathelement location="${lib.dir}/xpp3.jar" />~~
221		~~</classpath>~~
222		~~</taskdef>~~
223
224		~~<!-- Run JiBX binding compiler -->~~
225		~~<target name="bind" depends="compile" description="run JiBX binding compiler">~~
226		~~<!-- turn this off; if there's nothing to bind jibx will instead thrown an~~
227		~~error; when need to write jibx binding files for new types, uncomment this.~~
228		~~<bind binding="resources/binding.xml">~~
229		~~<classpathset dir="${build.classes.dir}" />~~
230		~~<classpathset dir="${lib.dir}/jmatter.jar" />~~
231		~~<classpathset dir="${lib.dir}/hibernate3.jar" />~~
232		~~<classpathset dir="${lib.dir}/jibx-run.jar" />~~
233		~~</bind> -->~~
234		~~</target>~~
235	211
236	212	<target name="hbm-practice" description="run hbm practice tool" depends="genhbm">
…	…
322	298	</target>
323	299
324		<target name="run-a-test" depends="compile-tests~~,bind~~" description="run a test">
	300	<target name="run-a-test" depends="compile-tests" description="run a test">
325	301	<junit fork="true" haltonfailure="true" printsummary="true">
326	302	<classpath refid="test.classpath" />
…	…
332	308	</target>
333	309
334		<target name="run-test" description="run a test class" depends="compile-tests~~,bind~~">
	310	<target name="run-test" description="run a test class" depends="compile-tests">
335	311	<java classname="${main.class}" classpathref="test.classpath" fork="true" />
336	312	</target>

jmatter-complet/branches/RM-JIBX/jmatter/Core.iml

r1411	r1474
40	40	<orderEntry type="library" name="Hibernate" level="project" />
41	41	<orderEntry type="library" name="JFreeReport" level="project" />
42		~~<orderEntry type="library" name="JiBX" level="project" />~~
43	42	<orderEntry type="module-library">
44	43	<library>

jmatter-complet/branches/RM-JIBX/jmatter/build.xml

r1454	r1474
77	77	<fileset dir="${resource.dir}" includes="styles.css,images/.gif,images/.png,images/*.jpg,app/model-metadata.properties" />
78	78	<fileset dir="${resource.dir}" includes="jfreereport.properties" />
79		<fileset dir="${resource.dir}/data" includes="*.~~xml~~" />
	79	<fileset dir="${resource.dir}/data" includes="*.json" />
80	80	<fileset dir="${src.dir}" includes="*/.xml" /> <!-- wizard fsm -->
81	81	</copy>
…	…
119	119	</target>
120	120
121		<target name="jar" description="jar jmatter framework" depends="~~bind~~, just-jar" />
	121	<target name="jar" description="jar jmatter framework" depends="compile, just-jar" />
122	122	<target name="cleanjar" description="clean first, then jar" depends="clean,jar" />
123	123
…	…
130	130
131	131	<target name="compile-tests"
132		depends="test-init,~~bind~~"
	132	depends="test-init,compile"
133	133	description="compile tests">
134	134	<javac debug="on" deprecation="on"
…	…
171	171	</target>
172	172
173		~~<!-- JiBX - related -->~~
174
175		~~<!-- JiBX binding compiler task definition -->~~
176		~~<taskdef name="bind" classname="org.jibx.binding.ant.CompileTask">~~
177		~~<classpath>~~
178		~~<pathelement location="${tools.lib.dir}/bcel.jar" />~~
179		~~<pathelement location="${tools.lib.dir}/jibx-bind.jar" />~~
180		~~<pathelement location="${runtime.lib.dir}/jibx-run.jar" />~~
181		~~<pathelement location="${runtime.lib.dir}/xpp3.jar" />~~
182		~~</classpath>~~
183		~~</taskdef>~~
184
185		~~<!-- Run JiBX binding compiler -->~~
186		~~<target name="bind" depends="compile" description="run JiBX binding compiler">~~
187		~~<bind binding="${resource.dir}/binding.xml">~~
188		~~<classpathset dir="${build.classes.dir}" />~~
189		~~<classpathset dir="${runtime.lib.dir}/jibx-run.jar" />~~
190		~~</bind>~~
191		~~</target>~~
192
193	173
194	174	<!-- TODO: override with -Dnew.project.name flag upon invoking target -->
…	…
242	222	</target>
243	223
244		<target name="ultraviolet" description="Launch UltraViolet design tool" depends="~~bind~~">
	224	<target name="ultraviolet" description="Launch UltraViolet design tool" depends="compile">
245	225	<ant antfile="tools/ultraviolet/build.xml" inheritAll="false" />
246	226	</target>

jmatter-complet/branches/RM-JIBX/jmatter/resources/project-template/build-standalone.xml

r1420	r1474
84	84	<fileset dir="resources/data" includes=".xml,.json" /> <!-- codes files -->
85	85	<!-- <fileset dir="resources" includes="log4j.properties" /> -->
86		<fileset dir="${src.dir}" includes="*/.xml,*/.jasper,*/.jfrm" />
	86	<fileset dir="${src.dir}" includes="*/.xml,*/.json,*/.jasper,*/.jfrm" />
87	87	<fileset dir="${src.dir}" includes="*/.gif,*/.png" /> <!-- any images referenced by jfree report xmls -->
88	88	</copy>
…	…
187	187	</target>
188	188
189		<target name="genhbm" depends="~~bind~~" description="generate hbm.xml files">
	189	<target name="genhbm" depends="compile" description="generate hbm.xml files">
190	190	<java classpathref="class.path" dir="${build.classes.dir}"
191	191	fork="true" classname="com.u2d.persist.HBMGenerator" />
192	192	</target>
193	193
194
195		~~<!-- JiBX - related -->~~
196
197		~~<!-- JiBX binding compiler task definition -->~~
198		~~<taskdef name="bind" classname="org.jibx.binding.ant.CompileTask">~~
199		~~<classpath>~~
200		~~<pathelement location="${lib.tools.dir}/bcel.jar" />~~
201		~~<pathelement location="${lib.tools.dir}/jibx-bind.jar" />~~
202		~~<pathelement location="${lib.dir}/jibx-run.jar" />~~
203		~~<pathelement location="${lib.dir}/xpp3.jar" />~~
204		~~</classpath>~~
205		~~</taskdef>~~
206
207		~~<!-- Run JiBX binding compiler -->~~
208		~~<target name="bind" depends="compile" description="run JiBX binding compiler">~~
209		~~<!-- turn this off; if there's nothing to bind jibx will instead thrown an~~
210		~~error; when need to write jibx binding files for new types, uncomment this.~~
211		~~<bind binding="resources/binding.xml">~~
212		~~<classpathset dir="${build.classes.dir}" />~~
213		~~<classpathset dir="${lib.dir}/jmatter.jar" />~~
214		~~<classpathset dir="${lib.dir}/hibernate3.jar" />~~
215		~~<classpathset dir="${lib.dir}/jibx-run.jar" />~~
216		~~</bind> -->~~
217		~~</target>~~
218	194
219	195	<target name="hbm-practice" description="run hbm practice tool" depends="genhbm">
…	…
289	265	</target>
290	266
291		<target name="run-a-test" depends="compile-tests~~,bind~~" description="run a test">
	267	<target name="run-a-test" depends="compile-tests" description="run a test">
292	268	<junit fork="true" haltonfailure="true" printsummary="true">
293	269	<classpath refid="test.classpath" />
…	…
299	275	</target>
300	276
301		<target name="run-test" description="run a test class" depends="compile-tests~~,bind~~">
	277	<target name="run-test" description="run a test class" depends="compile-tests">
302	278	<java classname="${main.class}" classpathref="test.classpath" fork="true" />
303	279	</target>

jmatter-complet/branches/RM-JIBX/jmatter/resources/project-template/build.xml

r1420	r1474
101	101	<fileset dir="resources/data" includes=".xml,.json" /> <!-- codes files -->
102	102	<!-- <fileset dir="resources" includes="log4j.properties" /> -->
103		<fileset dir="${src.dir}" includes="*/.xml,*/.jasper,*/.jfrm" />
	103	<fileset dir="${src.dir}" includes="*/.xml,*/.json,*/.jasper,*/.jfrm" />
104	104	<fileset dir="${src.dir}" includes="*/.gif,*/.png" /> <!-- any images referenced by jfree report xmls -->
105	105	</copy>
…	…
111	111
112	112	<target name="compile-framework">
113		<ant antfile="${framework.dir}/build.xml" inheritAll="false" target="~~bind~~" />
	113	<ant antfile="${framework.dir}/build.xml" inheritAll="false" target="compile" />
114	114	</target>
115	115
…	…
224	224	</target>
225	225
226		<target name="genhbm" depends="~~bind~~" description="generate hbm.xml files">
	226	<target name="genhbm" depends="compile" description="generate hbm.xml files">
227	227	<java classpathref="class.path" dir="${build.classes.dir}"
228	228	fork="true" classname="com.u2d.persist.HBMGenerator" />
229	229	</target>
230	230
231
232		~~<!-- JiBX - related -->~~
233
234		~~<!-- JiBX binding compiler task definition -->~~
235		~~<taskdef name="bind" classname="org.jibx.binding.ant.CompileTask">~~
236		~~<classpath>~~
237		~~<pathelement location="${lib.tools.dir}/bcel.jar" />~~
238		~~<pathelement location="${lib.tools.dir}/jibx-bind.jar" />~~
239		~~<pathelement location="${lib.dir}/jibx-run.jar" />~~
240		~~<pathelement location="${lib.dir}/xpp3.jar" />~~
241		~~</classpath>~~
242		~~</taskdef>~~
243
244		~~<!-- Run JiBX binding compiler -->~~
245		~~<target name="bind" depends="compile" description="run JiBX binding compiler">~~
246		~~<!-- turn this off; if there's nothing to bind jibx will instead thrown an~~
247		~~error; when need to write jibx binding files for new types, uncomment this.~~
248		~~<bind binding="resources/binding.xml">~~
249		~~<classpathset dir="${build.classes.dir}" />~~
250		~~<classpathset dir="${lib.dir}/jmatter.jar" />~~
251		~~<classpathset dir="${lib.dir}/hibernate3.jar" />~~
252		~~<classpathset dir="${lib.dir}/jibx-run.jar" />~~
253		~~</bind> -->~~
254		~~</target>~~
255	231
256	232	<target name="hbm-practice" description="run hbm practice tool" depends="genhbm">
…	…
341	317	</target>
342	318
343		<target name="run-a-test" depends="compile-tests~~,bind~~" description="run a test">
	319	<target name="run-a-test" depends="compile-tests" description="run a test">
344	320	<junit fork="true" haltonfailure="true" printsummary="true">
345	321	<classpath refid="test.classpath" />
…	…
351	327	</target>
352	328
353		<target name="run-test" description="run a test class" depends="compile-tests~~,bind~~">
	329	<target name="run-test" description="run a test class" depends="compile-tests">
354	330	<java classname="${main.class}" classpathref="test.classpath" fork="true" />
355	331	</target>

jmatter-complet/branches/RM-JIBX/jmatter/src/com/u2d/app/Application.java

r1284	r1474
12	12	import com.u2d.type.LogEventType;
13	13	import com.u2d.element.EOCommand;
14		import com.u2d.xml.CodesList;
	14	import com.u2d.json.CodesList;
	15	import com.u2d.json.JSON;
15	16	import com.u2d.pubsub.*;
16	17	import static com.u2d.pubsub.AppEventType.*;
17	18	import org.hibernate.*;
18		~~import org.jibx.runtime.*;~~
19	19	import org.springframework.context.ApplicationContext;
20	20	import org.springframework.context.support.ClassPathXmlApplicationContext;
21		~~import java.io.InputStream;~~
22	21	import java.util.logging.Logger;
23	22	import java.util.logging.Level;
…	…
176	175	if (_classBar == null)
177	176	{
178		_classBar = load~~XML~~ClassList();
	177	_classBar = loadJSONClassList();
179	178	((HBMPersistenceMechanism) _pmech).saveMany(_classBar.getSelfAndNestedFolders());
180	179	}
…	…
182	181	public Folder getClassBar() { return _classBar; }
183	182
184		private Folder load~~XML~~ClassList()
	183	private Folder loadJSONClassList()
185	184	{
186	185	try
187	186	{
188		IBindingFactory bfact = BindingDirectory.getFactory(Folder.class);
189		IUnmarshallingContext context = bfact.createUnmarshallingContext();
190
191		ClassLoader loader = Thread.currentThread().getContextClassLoader();
192		InputStream stream = loader.getResourceAsStream("class-list.xml");
193		Folder templateFolder = (Folder) context.unmarshalDocument(stream, null);
	187	Folder templateFolder = (Folder) JSON.readJsonFromResource("class-list.json");
194	188	templateFolder.getName().setValue(TEMPLATE_CLASSBAR);
195	189	return templateFolder;
196	190	}
197		catch (JiBXException ex)
198		{
199		System.err.println("JiBXException: "+ex.getMessage());
200		ex.printStackTrace();
201		System.exit(1);
202		}
203		return null;
	191	catch (Exception ex)
	192	{
	193	throw new RuntimeException("Failed to unmarshal class-list.json", ex);
	194	}
204	195	}
205	196

jmatter-complet/branches/RM-JIBX/jmatter/src/com/u2d/json/CodesList.java

r1406	r1474
1		package com.u2d.~~xml~~;
	1	package com.u2d.json;
2	2
3	3	import com.u2d.list.PlainListEObject;
4	4	import com.u2d.app.PersistenceMechanism;
5	5	import com.u2d.app.HBMPersistenceMechanism;
6		~~import com.u2d.app.Context;~~
7		~~import com.u2d.json.JSON;~~
8	6	import com.u2d.model.AbstractListEO;
9	7	import com.u2d.persist.HBMBlock;
…	…
13	11	import java.util.Set;
14	12	import java.io.InputStream;
15		~~import java.io.IOException;~~
16		~~import java.text.ParseException;~~
17		~~import org.jibx.runtime.IBindingFactory;~~
18		~~import org.jibx.runtime.BindingDirectory;~~
19		~~import org.jibx.runtime.IUnmarshallingContext;~~
20		~~import org.jibx.runtime.JiBXException;~~
21	13	import org.hibernate.Criteria;
22	14	import org.hibernate.Session;
23	15	import org.hibernate.criterion.Projections;
24	16	import org.json.JSONObject;
25		~~import org.json.JSONException;~~
26	17
27	18	/**
…	…
74	65	}
75	66
76		String resourceName = resourceNamePlural + ".~~xml~~";
	67	String resourceName = resourceNamePlural + ".json";
77	68	//System.out.println("************ Finding resource: " + resourceName);
78	69	if ( getStreamForResource(resourceName) != null) {
…	…
100	91	Class klass, String resourceName)
101	92	{
102		List items = (resourceName.endsWith(".json")) ? unmarshalJSON(resourceName)
103		: unmarshalXML(klass, resourceName);
	93	if (!resourceName.endsWith(".json"))
	94	{
	95	throw new RuntimeException("Supporting only JSON-format (no longer supporting xml)");
	96	}
	97	List items = unmarshalJSON(resourceName);
104	98	if (items == null)
105	99	{
…	…
121	115	return leo.getItems();
122	116	}
123		catch (IOException e)
124		{
125		e.printStackTrace();
126		}
127		catch (JSONException e)
128		{
129		e.printStackTrace();
130		}
131		catch (ClassNotFoundException e)
132		{
133		e.printStackTrace();
134		}
135		catch (ParseException e)
	117	catch (Exception e)
136	118	{
137	119	e.printStackTrace();
…	…
146	128	return loader.getResourceAsStream(resourceName);
147	129	}
148
149		~~public static List unmarshalXML(Class klass, String resourceName)~~
150		{
151		~~try~~
152		{
153		~~IBindingFactory _bfact;~~
154		~~_bfact = BindingDirectory.getFactory(klass);~~
155		~~IUnmarshallingContext uctx = _bfact.createUnmarshallingContext();~~
156
157		~~InputStream stream = getStreamForResource(resourceName);~~
158		~~CodesList codesList = (CodesList) uctx.unmarshalDocument(stream, null);~~
159
160		~~return codesList.items();~~
161		}
162		~~catch (JiBXException ex)~~
163		{
164		~~System.err.println(ex);~~
165		~~ex.printStackTrace();~~
166		}
167		~~return null;~~
168
169		~~} // end populateCodes()~~
170	130
171	131	private static void saveItems(PersistenceMechanism pmech, Class klass, final List items)
…	…
194	154	}
195	155
196
197		~~public static void dumpItemsFor(Class klass) throws Exception~~
198		{
199		~~CodesList codesList = new CodesList();~~
200		~~PersistenceMechanism pmech = Context.getInstance().getPersistenceMechanism();~~
201		~~codesList.setItems(pmech.list(klass));~~
202		~~JibxBoiler boiler = new JibxBoiler(klass);~~
203		~~boiler.marshal("dump.xml");~~
204		}
205	156	}

jmatter-complet/branches/RM-JIBX/jmatter/src/com/u2d/json/JSON.java

r1406	r1474
9	9	import com.u2d.list.PlainListEObject;
10	10	import com.u2d.list.CompositeList;
11		~~import java.util.List;~~
12	11	import java.util.Iterator;
13	12	import java.text.ParseException;
…	…
22	21	public class JSON
23	22	{
24		public static void writeJson(File file, ComplexEObject ceo)
25		throws JSONException, IOException
26		{
27		writeTextFile(json(ceo).toString(2), file.getAbsolutePath());
28		}
29		public static void writeJson(File file, AbstractListEO leo)
30		throws JSONException, IOException
31		{
32		writeTextFile(json(leo).toString(2), file.getAbsolutePath());
33		}
34
35
	23
36	24	public static JSONObject json(AbstractListEO leo) throws JSONException
37	25	{
…	…
48	36	JSONObject jso = new JSONObject();
49	37	jso.put("item-type", leo.type().getJavaClass().getName());
50		~~List list = leo.getItems();~~
51	38	JSONArray ra = new JSONArray();
52		for (int i=0; i<l~~ist.s~~ize(); i++)
53		{
54		ra.put(json((ComplexEObject) l~~ist~~.get(i), spec));
	39	for (int i=0; i<leo.getSize(); i++)
	40	{
	41	ra.put(json((ComplexEObject) leo.get(i), spec));
55	42	}
56	43	jso.put("items", ra);
…	…
70	57	* controls serialization depth to a certain extent
71	58	* @return the serialized jsonobject
	59	* @throws org.json.JSONException
72	60	*/
73	61	public static JSONObject json(ComplexEObject eo, String... includes) throws JSONException
…	…
81	69	JSONObject obj = new JSONObject();
82	70	obj.put("type", eo.getClass().getName());
	71
	72	if (eo instanceof ComplexType)
	73	{
	74	ComplexType value = (ComplexType) eo;
	75	obj.put("value", value.getJavaClass().getName());
	76	return obj;
	77	}
	78
83	79	for (Iterator itr = eo.childFields().iterator(); itr.hasNext(); )
84	80	{
…	…
92	88	}
93	89
	90	Object childObject = field.get(eo);
94	91	if (field.isAtomic())
95	92	{
96		AtomicEObject atom = (AtomicEObject) ~~field.get(eo)~~;
	93	AtomicEObject atom = (AtomicEObject) childObject;
97	94	obj.put(field.name(), atom.marshal());
98	95	}
…	…
101	98	if (field.isComposite())
102	99	{
103		CompositeList list = (CompositeList) ~~field.get(eo)~~;
	100	CompositeList list = (CompositeList) childObject;
104	101	assert spec != null;
105	102	obj.put(field.name(), json(list, spec.specForComposite(field.name())));
…	…
107	104	else
108	105	{
109		AbstractListEO list = (AbstractListEO) ~~field.get(eo)~~;
	106	AbstractListEO list = (AbstractListEO) childObject;
110	107	assert spec != null;
111	108	obj.put(field.name(), json(list, spec.specFor(field.name())));
…	…
114	111	else if (field.isAggregate())
115	112	{
116		ComplexEObject child = (ComplexEObject) ~~field.get(eo)~~;
	113	ComplexEObject child = (ComplexEObject) childObject;
117	114	assert spec != null;
118	115	obj.put(field.name(), json(child, spec.specForComposite(field.name())));
…	…
120	117	else if (field.isAssociation() && spec!=null)
121	118	{
122		ComplexEObject association = (ComplexEObject) ~~field.get(eo)~~;
	119	ComplexEObject association = (ComplexEObject) childObject;
123	120	if (spec.includes(field.name()))
124	121	{
…	…
275	272	}
276	273
	274	// i/o related
	275
277	276	public static String readInputStream(InputStream is)
278	277	throws IOException
…	…
302	301	pw.close();
303	302	}
	303
	304	public static void writeJson(File file, ComplexEObject ceo)
	305	throws JSONException, IOException
	306	{
	307	writeTextFile(json(ceo).toString(2), file.getAbsolutePath());
	308	}
	309	public static void writeJson(File file, AbstractListEO leo)
	310	throws JSONException, IOException
	311	{
	312	writeTextFile(json(leo).toString(2), file.getAbsolutePath());
	313	}
	314
	315	public static Object readJsonFromResource(String resource) throws IOException, JSONException, ClassNotFoundException, ParseException
	316	{
	317	ClassLoader loader = Thread.currentThread().getContextClassLoader();
	318	InputStream stream = loader.getResourceAsStream(resource);
	319	String jsonText = readInputStream(stream);
	320	return JSON.fromJson(new JSONObject(jsonText));
	321	}
	322
304	323	}

jmatter-complet/branches/RM-JIBX/jmatter/src/com/u2d/list/CriteriaListEO.java

r1463	r1474
13	13	import com.u2d.ui.sorttable.SortTableModel;
14	14	import com.u2d.element.Field;
	15	import com.u2d.element.CommandInfo;
15	16	import com.u2d.find.Query;
16	17	import com.u2d.find.QueryReceiver;
…	…
20	21	import org.hibernate.criterion.Order;
21	22	import org.hibernate.criterion.Projections;
	23	import org.json.JSONObject;
	24	import org.json.JSONArray;
22	25	import static com.u2d.pubsub.AppEventType.*;
23	26	import com.u2d.type.atom.StringEO;
	27	import com.u2d.type.atom.FileWEO;
	28	import com.u2d.reflection.Cmd;
	29	import com.u2d.reflection.Arg;
	30	import com.u2d.json.JSON;
24	31
25	32	/**
…	…
190	197	}
191	198
	199	@Cmd(description="A potentially lengthy operation")
	200	public String ExportEntireListingToJSON(CommandInfo cmdInfo, @Arg("Save to:")FileWEO file) throws Exception
	201	{
	202	CriteriaListEO leo = (CriteriaListEO) type().Browse(cmdInfo);
	203	vmech().message("Saving page 1");
	204	JSONObject json = JSON.json(leo);
	205	JSONArray ra = json.getJSONArray("items");
	206	while (leo.hasNextPage())
	207	{
	208	vmech().message(String.format("Saving page %d", leo.pageNum()));
	209	leo.nextPage();
	210	for (int i=0; i<leo.getSize(); i++)
	211	{
	212	ra.put(JSON.json((ComplexEObject) leo.get(i)));
	213	}
	214	}
	215	JSON.writeTextFile(json.toString(2), file.fileValue().getAbsolutePath());
	216	return file.fileValue().getName() + " created.";
	217	}
	218
192	219	/* ===== View-Related ===== */
193	220

jmatter-complet/branches/RM-JIBX/jmatter/src/com/u2d/model/AbstractComplexEObject.java

r1470	r1474
11	11	import java.beans.*;
12	12	import java.awt.datatransfer.*;
13		~~import java.io.StringWriter;~~
14		~~import java.io.ByteArrayOutputStream;~~
15	13
16	14	import com.u2d.element.*;
…	…
25	23	import com.u2d.type.atom.FileWEO;
26	24	import com.u2d.view.*;
27		~~import com.u2d.xml.XMLExport;~~
28	25	import com.u2d.reflection.Cmd;
29	26	import com.u2d.reflection.Arg;
…	…
787	784	}
788	785
789		// @Cmd
790		public void ExportToXML(CommandInfo cmdInfo) throws Exception
791		{
792		XMLExport.export(cmdInfo, AbstractComplexEObject.this);
793		}
794		// @Cmd
	786	@Cmd
795	787	public String ExportToJSON(CommandInfo cmdInfo, @Arg("Save to:") FileWEO file) throws Exception
796	788	{

Download in other formats: