[ccmtools-cvs] ccmtools/src/ccmtools/generator/idl Main.java, 1.9, 1.10

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

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

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

Index: Main.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/idl/Main.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Main.java	18 Dec 2006 21:34:19 -0000	1.9
--- Main.java	18 Jan 2007 17:11:51 -0000	1.10
***************
*** 18,22 ****
  import ccmtools.generator.idl.metamodel.ModelRepository;
  import ccmtools.metamodel.BaseIDL.MContainer;
! import ccmtools.parser.idl.ParserHelper;
  import ccmtools.ui.UserInterfaceDriver;
  import ccmtools.utils.ConfigurationLocator;
--- 18,22 ----
  import ccmtools.generator.idl.metamodel.ModelRepository;
  import ccmtools.metamodel.BaseIDL.MContainer;
! import ccmtools.parser.idl.ParserManager;
  import ccmtools.ui.UserInterfaceDriver;
  import ccmtools.utils.ConfigurationLocator;
***************
*** 63,68 ****
  				{
  					String idlFile = (String) i.next();
!                     MContainer ccmModel = 
!                         ParserHelper.getInstance().loadCcmModel(uiDriver, idlFile, parameters.getIncludePaths());
  
                      // Transform CCM Model to IDL Implementation Model
--- 63,67 ----
  				{
  					String idlFile = (String) i.next();
!                     MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, idlFile, parameters.getIncludePaths());
  
                      // Transform CCM Model to IDL Implementation Model
***************
*** 84,88 ****
  		catch (ParseException e)
  		{
- 			e.printStackTrace();
  			uiDriver.printError(e.getMessage());
  			printUsage();
--- 83,86 ----
***************
*** 90,94 ****
  		catch (CcmtoolsException e)
  		{
- //			e.printStackTrace();
  			exitWithErrorStatus(e.getMessage());
  		}
--- 88,91 ----
***************
*** 100,104 ****
  		catch (Exception e)
  		{
- 			e.printStackTrace();
  			exitWithErrorStatus(e.getMessage());
  		}
--- 97,100 ----