Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/metamodel
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/src/ccmtools/metamodel
Modified Files:
Main.java
Log Message:
Refactored IDL parser to support different PreProcessor implementations
Index: Main.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/metamodel/Main.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Main.java 18 Dec 2006 21:34:19 -0000 1.10
--- Main.java 18 Jan 2007 17:11:47 -0000 1.11
***************
*** 14,18 ****
import ccmtools.CcmtoolsException;
import ccmtools.metamodel.BaseIDL.MContainer;
! import ccmtools.parser.idl.ParserHelper;
import ccmtools.ui.UserInterfaceDriver;
import ccmtools.utils.ConfigurationLocator;
--- 14,18 ----
import ccmtools.CcmtoolsException;
import ccmtools.metamodel.BaseIDL.MContainer;
! import ccmtools.parser.idl.ParserManager;
import ccmtools.ui.UserInterfaceDriver;
import ccmtools.utils.ConfigurationLocator;
***************
*** 65,69 ****
for (String idlFile : parameters.getIdlFiles())
{
! ParserHelper.getInstance().loadCcmModel(uiDriver, idlFile, parameters.getIncludePaths());
}
}
--- 65,69 ----
for (String idlFile : parameters.getIdlFiles())
{
! ParserManager.loadCcmModel(uiDriver, idlFile, parameters.getIncludePaths());
}
}
***************
*** 84,88 ****
{
MContainer ccmModel =
! ParserHelper.getInstance().loadCcmModel(uiDriver, idlFile, parameters.getIncludePaths());
CcmModelValidator validator = new CcmModelValidator(uiDriver, parameters);
if(!validator.isValidModel(ccmModel))
--- 84,88 ----
{
MContainer ccmModel =
! ParserManager.loadCcmModel(uiDriver, idlFile, parameters.getIncludePaths());
CcmModelValidator validator = new CcmModelValidator(uiDriver, parameters);
if(!validator.isValidModel(ccmModel))
|
