|
From: Teiniker E. <tei...@us...> - 2007-01-18 17:12:30
|
Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/src-test/ccmtools/parser/idl/valuetype Modified Files: ValuetypeTest.java Log Message: Refactored IDL parser to support different PreProcessor implementations Index: ValuetypeTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype/ValuetypeTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ValuetypeTest.java 8 Nov 2006 10:31:34 -0000 1.1 --- ValuetypeTest.java 18 Jan 2007 17:11:52 -0000 1.2 *************** *** 20,24 **** import ccmtools.metamodel.BaseIDL.MValueMemberDef; import ccmtools.metamodel.ComponentIDL.MFactoryDef; ! import ccmtools.parser.idl.ParserHelper; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; --- 20,24 ---- import ccmtools.metamodel.BaseIDL.MValueMemberDef; import ccmtools.metamodel.ComponentIDL.MFactoryDef; ! import ccmtools.parser.idl.ParserManager; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; *************** *** 36,40 **** uiDriver = new ConsoleDriver(); } - --- 36,39 ---- *************** *** 85,89 **** { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println("#" + modelElements.size() + ": " + modelElements); --- 84,88 ---- { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println("#" + modelElements.size() + ": " + modelElements); *************** *** 102,106 **** { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); --- 101,105 ---- { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); *************** *** 112,116 **** { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); --- 111,115 ---- { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); *************** *** 122,126 **** { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println("#" + modelElements.size() + ": " + modelElements); --- 121,125 ---- { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println("#" + modelElements.size() + ": " + modelElements); |