[ccmtools-cvs] ccmtools/src/ccmtools/generator/java Main.java, 1.11, 1.12

[Robert L. <rle...@us...>]

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

Modified Files:
	Main.java 
Log Message:
read all IDL-files before code generation, because the assambly generator needs all informations

Index: Main.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/Main.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Main.java	15 Feb 2007 16:46:41 -0000	1.11
--- Main.java	21 Feb 2007 08:49:32 -0000	1.12
***************
*** 3,6 ****
--- 3,7 ----
  import java.io.FileNotFoundException;
  import java.util.Iterator;
+ import java.util.List;
  import java.util.logging.Logger;
  import org.apache.commons.cli.CommandLine;
***************
*** 57,85 ****
  			{
  				parameters.validate();
! 				setCcmtoolsProperties();
! 				JavaComponentGenerator generator = new JavaComponentGenerator(parameters, uiDriver);
!                 
!                 Model assemblies = ccmtools.parser.assembly.Main.parse(parameters.getAssemblyFiles());
! 
! 				for (Iterator i = parameters.getIdlFiles().iterator(); i.hasNext();)
! 				{
! 					String idlFile = (String) i.next();
!                     MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, idlFile, parameters.getIncludePaths());
!                     assemblies.updateCcmModel(ccmModel);
! 
! 					// Transform CCM Model to Java Implementation Model
! 					GraphTraverser traverser = new CcmGraphTraverser();
! 					CcmToJavaModelMapper nodeHandler = new CcmToJavaModelMapper();
! 					traverser.addHandler(nodeHandler);
! 					traverser.traverseGraph(ccmModel);
  
! 					// Query the Java Implementation Model and generate all source
! 					// file objects for the Java Client Library
! 					ModelRepository javaModel = nodeHandler.getJavaModel();
  
! 					// Run the Java component generator which can handle all of
! 					// the different generator flags (-iface, -local, -app, -clientlib, etc.)
! 					generator.generate(javaModel, assemblies);
! 				}
  			}
  		}
--- 58,84 ----
  			{
  				parameters.validate();
!                 setCcmtoolsProperties();
!                 JavaComponentGenerator generator = new JavaComponentGenerator(parameters, uiDriver);
!                 Model assemblies = ccmtools.parser.assembly.Main.parse(parameters
!                         .getAssemblyFiles());
!                 List<MContainer> models = ParserManager.loadCcmModels(uiDriver, parameters
!                         .getIdlFiles(), parameters.getIncludePaths());
!                 assemblies.updateCcmModels(models);
!                 for (MContainer ccmModel : models)
!                 {
!                     // Transform CCM Model to Java Implementation Model
!                     GraphTraverser traverser = new CcmGraphTraverser();
!                     CcmToJavaModelMapper nodeHandler = new CcmToJavaModelMapper();
!                     traverser.addHandler(nodeHandler);
!                     traverser.traverseGraph(ccmModel);
  
!                     // Query the Java Implementation Model and generate all source
!                     // file objects for the Java Client Library
!                     ModelRepository javaModel = nodeHandler.getJavaModel();
  
!                     // Run the Java component generator which can handle all of
!                     // the different generator flags (-iface, -local, -app, -clientlib, etc.)
!                     generator.generate(javaModel, assemblies);
!                 }
  			}
  		}