ccmtools-cvs

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/module
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/src-test/ccmtools/parser/idl/module

Modified Files:
	ModuleTest.java 
Log Message:
Refactored IDL parser to support different PreProcessor implementations

Index: ModuleTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/module/ModuleTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ModuleTest.java	24 Nov 2006 14:48:17 -0000	1.2
--- ModuleTest.java	18 Jan 2007 17:11:57 -0000	1.3
***************
*** 12,16 ****
  import ccmtools.metamodel.BaseIDL.MContainer;
  import ccmtools.metamodel.BaseIDL.MModuleDef;
! import ccmtools.parser.idl.ParserHelper;
  import ccmtools.ui.ConsoleDriver;
  import ccmtools.ui.UserInterfaceDriver;
--- 12,16 ----
  import ccmtools.metamodel.BaseIDL.MContainer;
  import ccmtools.metamodel.BaseIDL.MModuleDef;
! import ccmtools.parser.idl.ParserManager;
  import ccmtools.ui.ConsoleDriver;
  import ccmtools.ui.UserInterfaceDriver;
***************
*** 35,39 ****
          UserInterfaceDriver uiDriver= new ConsoleDriver();
          System.out.println("[" + sourceCode + "]");
!         MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode);
          List modelElements = ccmModel.getContentss();
          System.out.println(modelElements);
--- 35,39 ----
          UserInterfaceDriver uiDriver= new ConsoleDriver();
          System.out.println("[" + sourceCode + "]");
!         MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode);
          List modelElements = ccmModel.getContentss();
          System.out.println(modelElements);
***************
*** 46,50 ****
          UserInterfaceDriver uiDriver= new ConsoleDriver();
          System.out.println("[" + sourceCode + "]");
!         MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode);
          List modelElements = ccmModel.getContentss();
          System.out.println("#" + modelElements.size() + ":  " + modelElements);
--- 46,50 ----
          UserInterfaceDriver uiDriver= new ConsoleDriver();
          System.out.println("[" + sourceCode + "]");
!         MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode);
          List modelElements = ccmModel.getContentss();
          System.out.println("#" + modelElements.size() + ":  " + modelElements);
***************
*** 65,69 ****
          UserInterfaceDriver uiDriver = new ConsoleDriver();
          System.out.println("[" + sourceCode + "]");
!         MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode);
          
          List<MModuleDef> result = new ArrayList<MModuleDef>();
--- 65,69 ----
          UserInterfaceDriver uiDriver = new ConsoleDriver();
          System.out.println("[" + sourceCode + "]");
!         MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode);
          
          List<MModuleDef> result = new ArrayList<MModuleDef>();