ccmtools-cvs

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

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

Modified Files:
	ArrayDeclarator.java idlparser.cup ModelRepository.java 
	ParserHelper.java ParserManager.java 
Log Message:
Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel.

Index: ArrayDeclarator.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl/ArrayDeclarator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ArrayDeclarator.java	15 Sep 2006 11:29:13 -0000	1.1
--- ArrayDeclarator.java	19 Jan 2007 12:06:51 -0000	1.2
***************
*** 1,5 ****
  package ccmtools.parser.idl;
  
! import ccmtools.metamodel.BaseIDL.MArrayDef;
  
  public class ArrayDeclarator
--- 1,5 ----
  package ccmtools.parser.idl;
  
! import ccmtools.parser.idl.metamodel.BaseIDL.MArrayDef;
  
  public class ArrayDeclarator

Index: ParserManager.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl/ParserManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ParserManager.java	18 Jan 2007 17:11:49 -0000	1.1
--- ParserManager.java	19 Jan 2007 12:06:52 -0000	1.2
***************
*** 7,12 ****
  
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.BaseIDL.MContainer;
  import ccmtools.parser.cpp.CppManager;
  import ccmtools.ui.UserInterfaceDriver;
  
--- 7,12 ----
  
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.cpp.CppManager;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MContainer;
  import ccmtools.ui.UserInterfaceDriver;
  

Index: idlparser.cup
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl/idlparser.cup,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** idlparser.cup	10 Jan 2007 16:19:17 -0000	1.27
--- idlparser.cup	19 Jan 2007 12:06:51 -0000	1.28
***************
*** 6,11 ****
  import java_cup.runtime.*;
  
! import ccmtools.metamodel.BaseIDL.*;
! import ccmtools.metamodel.ComponentIDL.*;
  
  parser code 
--- 6,11 ----
  import java_cup.runtime.*;
  
! import ccmtools.parser.idl.metamodel.BaseIDL.*;
! import ccmtools.parser.idl.metamodel.ComponentIDL.*;
  
  parser code 

Index: ParserHelper.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl/ParserHelper.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** ParserHelper.java	18 Jan 2007 17:11:48 -0000	1.42
--- ParserHelper.java	19 Jan 2007 12:06:51 -0000	1.43
***************
*** 9,76 ****
  
  import java_cup.runtime.Symbol;
! import ccmtools.metamodel.BaseIDL.MAliasDef;
! import ccmtools.metamodel.BaseIDL.MAliasDefImpl;
! import ccmtools.metamodel.BaseIDL.MArrayDef;
! import ccmtools.metamodel.BaseIDL.MArrayDefImpl;
! import ccmtools.metamodel.BaseIDL.MAttributeDef;
! import ccmtools.metamodel.BaseIDL.MAttributeDefImpl;
! import ccmtools.metamodel.BaseIDL.MConstantDef;
! import ccmtools.metamodel.BaseIDL.MConstantDefImpl;
! import ccmtools.metamodel.BaseIDL.MContained;
! import ccmtools.metamodel.BaseIDL.MContainer;
! import ccmtools.metamodel.BaseIDL.MContainerImpl;
! import ccmtools.metamodel.BaseIDL.MEnumDef;
! import ccmtools.metamodel.BaseIDL.MEnumDefImpl;
! import ccmtools.metamodel.BaseIDL.MExceptionDef;
! import ccmtools.metamodel.BaseIDL.MExceptionDefImpl;
! import ccmtools.metamodel.BaseIDL.MFieldDef;
! import ccmtools.metamodel.BaseIDL.MFieldDefImpl;
! import ccmtools.metamodel.BaseIDL.MFixedDef;
! import ccmtools.metamodel.BaseIDL.MFixedDefImpl;
! import ccmtools.metamodel.BaseIDL.MIDLType;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.metamodel.BaseIDL.MInterfaceDefImpl;
! import ccmtools.metamodel.BaseIDL.MModuleDef;
! import ccmtools.metamodel.BaseIDL.MModuleDefImpl;
! import ccmtools.metamodel.BaseIDL.MNativeDef;
! import ccmtools.metamodel.BaseIDL.MNativeDefImpl;
! import ccmtools.metamodel.BaseIDL.MOperationDef;
! import ccmtools.metamodel.BaseIDL.MOperationDefImpl;
! import ccmtools.metamodel.BaseIDL.MParameterDef;
! import ccmtools.metamodel.BaseIDL.MParameterDefImpl;
! import ccmtools.metamodel.BaseIDL.MParameterMode;
! import ccmtools.metamodel.BaseIDL.MPrimitiveDef;
! import ccmtools.metamodel.BaseIDL.MPrimitiveDefImpl;
! import ccmtools.metamodel.BaseIDL.MPrimitiveKind;
! import ccmtools.metamodel.BaseIDL.MSequenceDef;
! import ccmtools.metamodel.BaseIDL.MSequenceDefImpl;
! import ccmtools.metamodel.BaseIDL.MStringDef;
! import ccmtools.metamodel.BaseIDL.MStringDefImpl;
! import ccmtools.metamodel.BaseIDL.MStructDef;
! import ccmtools.metamodel.BaseIDL.MStructDefImpl;
! import ccmtools.metamodel.BaseIDL.MTypedefDef;
! import ccmtools.metamodel.BaseIDL.MUnionDef;
! import ccmtools.metamodel.BaseIDL.MUnionDefImpl;
! import ccmtools.metamodel.BaseIDL.MUnionFieldDef;
! import ccmtools.metamodel.BaseIDL.MUnionFieldDefImpl;
! import ccmtools.metamodel.BaseIDL.MValueBoxDef;
! import ccmtools.metamodel.BaseIDL.MValueBoxDefImpl;
! import ccmtools.metamodel.BaseIDL.MValueDef;
! import ccmtools.metamodel.BaseIDL.MValueDefImpl;
! import ccmtools.metamodel.BaseIDL.MValueMemberDef;
! import ccmtools.metamodel.BaseIDL.MValueMemberDefImpl;
! import ccmtools.metamodel.BaseIDL.MWstringDef;
! import ccmtools.metamodel.BaseIDL.MWstringDefImpl;
! import ccmtools.metamodel.ComponentIDL.MComponentDef;
! import ccmtools.metamodel.ComponentIDL.MComponentDefImpl;
! import ccmtools.metamodel.ComponentIDL.MFactoryDef;
! import ccmtools.metamodel.ComponentIDL.MFactoryDefImpl;
! import ccmtools.metamodel.ComponentIDL.MFinderDef;
! import ccmtools.metamodel.ComponentIDL.MHomeDef;
! import ccmtools.metamodel.ComponentIDL.MHomeDefImpl;
! import ccmtools.metamodel.ComponentIDL.MProvidesDef;
! import ccmtools.metamodel.ComponentIDL.MProvidesDefImpl;
! import ccmtools.metamodel.ComponentIDL.MUsesDef;
! import ccmtools.metamodel.ComponentIDL.MUsesDefImpl;
  import ccmtools.utils.Text;
  
--- 9,76 ----
  
  import java_cup.runtime.Symbol;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MArrayDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MArrayDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAttributeDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAttributeDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MConstantDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MConstantDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MContained;
! import ccmtools.parser.idl.metamodel.BaseIDL.MContainer;
! import ccmtools.parser.idl.metamodel.BaseIDL.MContainerImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MEnumDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MEnumDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MExceptionDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MExceptionDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MFieldDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MFieldDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MFixedDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MFixedDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MIDLType;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MModuleDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MModuleDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MNativeDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MNativeDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MOperationDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MOperationDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterMode;
! import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveKind;
! import ccmtools.parser.idl.metamodel.BaseIDL.MSequenceDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MSequenceDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MStringDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MStringDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MStructDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MStructDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MTypedefDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MUnionDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MUnionDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MUnionFieldDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MUnionFieldDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MValueBoxDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MValueBoxDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MValueDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MValueDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MValueMemberDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MValueMemberDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MWstringDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MWstringDefImpl;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MComponentDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MComponentDefImpl;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MFactoryDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MFactoryDefImpl;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MFinderDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MHomeDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MHomeDefImpl;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MProvidesDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MProvidesDefImpl;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MUsesDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MUsesDefImpl;
  import ccmtools.utils.Text;
  

Index: ModelRepository.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl/ModelRepository.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ModelRepository.java	24 Nov 2006 18:43:08 -0000	1.6
--- ModelRepository.java	19 Jan 2007 12:06:51 -0000	1.7
***************
*** 5,10 ****
  import java.util.logging.Logger;
  
! import ccmtools.metamodel.BaseIDL.MExceptionDef;
! import ccmtools.metamodel.BaseIDL.MIDLType;
  
  public class ModelRepository
--- 5,10 ----
  import java.util.logging.Logger;
  
! import ccmtools.parser.idl.metamodel.BaseIDL.MExceptionDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MIDLType;
  
  public class ModelRepository