Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4737/src/ccmtools/CppGenerator Modified Files: CppGenerator.java CppLocalGenerator.java CppRemoteTestGenerator.java CppRemoteGenerator.java CppLocalTestGenerator.java Log Message: Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel. Index: CppLocalGenerator.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/CppLocalGenerator.java,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** CppLocalGenerator.java 3 Jan 2007 10:04:23 -0000 1.49 --- CppLocalGenerator.java 19 Jan 2007 12:07:16 -0000 1.50 *************** *** 36,63 **** import ccmtools.CodeGenerator.Template; import ccmtools.CppGenerator.plugin.AnyPluginManager; ! import ccmtools.metamodel.BaseIDL.MAliasDef; ! import ccmtools.metamodel.BaseIDL.MArrayDef; ! import ccmtools.metamodel.BaseIDL.MAttributeDef; ! import ccmtools.metamodel.BaseIDL.MConstantDef; ! import ccmtools.metamodel.BaseIDL.MContained; ! import ccmtools.metamodel.BaseIDL.MEnumDef; ! import ccmtools.metamodel.BaseIDL.MExceptionDef; ! import ccmtools.metamodel.BaseIDL.MFieldDef; ! import ccmtools.metamodel.BaseIDL.MIDLType; ! import ccmtools.metamodel.BaseIDL.MInterfaceDef; ! import ccmtools.metamodel.BaseIDL.MOperationDef; ! import ccmtools.metamodel.BaseIDL.MParameterDef; ! import ccmtools.metamodel.BaseIDL.MPrimitiveDef; ! import ccmtools.metamodel.BaseIDL.MPrimitiveKind; ! import ccmtools.metamodel.BaseIDL.MSequenceDef; ! import ccmtools.metamodel.BaseIDL.MStringDef; ! import ccmtools.metamodel.BaseIDL.MStructDef; ! import ccmtools.metamodel.BaseIDL.MTyped; ! import ccmtools.metamodel.BaseIDL.MTypedefDef; ! import ccmtools.metamodel.BaseIDL.MUnionDef; ! import ccmtools.metamodel.BaseIDL.MWstringDef; ! import ccmtools.metamodel.ComponentIDL.MComponentDef; ! import ccmtools.metamodel.ComponentIDL.MHomeDef; ! import ccmtools.metamodel.ComponentIDL.MProvidesDef; import ccmtools.ui.UserInterfaceDriver; import ccmtools.utils.ConfigurationLocator; --- 36,63 ---- import ccmtools.CodeGenerator.Template; import ccmtools.CppGenerator.plugin.AnyPluginManager; ! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MArrayDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MAttributeDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MConstantDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MContained; ! import ccmtools.parser.idl.metamodel.BaseIDL.MEnumDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MExceptionDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MFieldDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MIDLType; ! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MOperationDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveKind; ! import ccmtools.parser.idl.metamodel.BaseIDL.MSequenceDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MStringDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MStructDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MTyped; ! import ccmtools.parser.idl.metamodel.BaseIDL.MTypedefDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MUnionDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MWstringDef; ! import ccmtools.parser.idl.metamodel.ComponentIDL.MComponentDef; ! import ccmtools.parser.idl.metamodel.ComponentIDL.MHomeDef; ! import ccmtools.parser.idl.metamodel.ComponentIDL.MProvidesDef; import ccmtools.ui.UserInterfaceDriver; import ccmtools.utils.ConfigurationLocator; Index: CppLocalTestGenerator.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/CppLocalTestGenerator.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** CppLocalTestGenerator.java 3 Jan 2007 10:04:23 -0000 1.17 --- CppLocalTestGenerator.java 19 Jan 2007 12:07:17 -0000 1.18 *************** *** 28,33 **** import ccmtools.CodeGenerator.Template; ! import ccmtools.metamodel.BaseIDL.MContained; ! import ccmtools.metamodel.BaseIDL.MOperationDef; import ccmtools.ui.UserInterfaceDriver; import ccmtools.utils.ConfigurationLocator; --- 28,33 ---- import ccmtools.CodeGenerator.Template; ! import ccmtools.parser.idl.metamodel.BaseIDL.MContained; ! import ccmtools.parser.idl.metamodel.BaseIDL.MOperationDef; import ccmtools.ui.UserInterfaceDriver; import ccmtools.utils.ConfigurationLocator; Index: CppGenerator.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/CppGenerator.java,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** CppGenerator.java 16 Jan 2007 13:28:32 -0000 1.37 --- CppGenerator.java 19 Jan 2007 12:07:16 -0000 1.38 *************** *** 36,67 **** import ccmtools.CodeGenerator.CodeGenerator; import ccmtools.CodeGenerator.Template; ! import ccmtools.metamodel.BaseIDL.MAliasDef; ! import ccmtools.metamodel.BaseIDL.MArrayDef; ! import ccmtools.metamodel.BaseIDL.MAttributeDef; ! import ccmtools.metamodel.BaseIDL.MContained; ! import ccmtools.metamodel.BaseIDL.MContainer; ! import ccmtools.metamodel.BaseIDL.MDefinitionKind; ! import ccmtools.metamodel.BaseIDL.MEnumDef; ! import ccmtools.metamodel.BaseIDL.MExceptionDef; ! import ccmtools.metamodel.BaseIDL.MFixedDef; ! import ccmtools.metamodel.BaseIDL.MIDLType; ! import ccmtools.metamodel.BaseIDL.MInterfaceDef; ! import ccmtools.metamodel.BaseIDL.MOperationDef; ! import ccmtools.metamodel.BaseIDL.MParameterDef; ! import ccmtools.metamodel.BaseIDL.MParameterMode; ! import ccmtools.metamodel.BaseIDL.MPrimitiveDef; ! import ccmtools.metamodel.BaseIDL.MPrimitiveKind; ! import ccmtools.metamodel.BaseIDL.MSequenceDef; ! import ccmtools.metamodel.BaseIDL.MStringDef; ! import ccmtools.metamodel.BaseIDL.MTyped; ! import ccmtools.metamodel.BaseIDL.MTypedefDef; ! import ccmtools.metamodel.BaseIDL.MWstringDef; ! import ccmtools.metamodel.ComponentIDL.MComponentDef; ! import ccmtools.metamodel.ComponentIDL.MFactoryDef; ! import ccmtools.metamodel.ComponentIDL.MFinderDef; ! import ccmtools.metamodel.ComponentIDL.MHomeDef; ! import ccmtools.metamodel.ComponentIDL.MProvidesDef; ! import ccmtools.metamodel.ComponentIDL.MSupportsDef; ! import ccmtools.metamodel.ComponentIDL.MUsesDef; import ccmtools.ui.UserInterfaceDriver; import ccmtools.utils.Text; --- 36,67 ---- import ccmtools.CodeGenerator.CodeGenerator; import ccmtools.CodeGenerator.Template; ! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MArrayDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MAttributeDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MContained; ! import ccmtools.parser.idl.metamodel.BaseIDL.MContainer; ! import ccmtools.parser.idl.metamodel.BaseIDL.MDefinitionKind; ! import ccmtools.parser.idl.metamodel.BaseIDL.MEnumDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MExceptionDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MFixedDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MIDLType; ! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MOperationDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterMode; ! import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveKind; ! import ccmtools.parser.idl.metamodel.BaseIDL.MSequenceDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MStringDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MTyped; ! import ccmtools.parser.idl.metamodel.BaseIDL.MTypedefDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MWstringDef; ! import ccmtools.parser.idl.metamodel.ComponentIDL.MComponentDef; ! import ccmtools.parser.idl.metamodel.ComponentIDL.MFactoryDef; ! import ccmtools.parser.idl.metamodel.ComponentIDL.MFinderDef; ! import ccmtools.parser.idl.metamodel.ComponentIDL.MHomeDef; ! import ccmtools.parser.idl.metamodel.ComponentIDL.MProvidesDef; ! import ccmtools.parser.idl.metamodel.ComponentIDL.MSupportsDef; ! import ccmtools.parser.idl.metamodel.ComponentIDL.MUsesDef; import ccmtools.ui.UserInterfaceDriver; import ccmtools.utils.Text; Index: CppRemoteTestGenerator.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/CppRemoteTestGenerator.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** CppRemoteTestGenerator.java 3 Jan 2007 17:26:17 -0000 1.14 --- CppRemoteTestGenerator.java 19 Jan 2007 12:07:16 -0000 1.15 *************** *** 24,28 **** import ccmtools.CodeGenerator.Template; ! import ccmtools.metamodel.BaseIDL.MContained; import ccmtools.ui.UserInterfaceDriver; import ccmtools.utils.Confix; --- 24,28 ---- import ccmtools.CodeGenerator.Template; ! import ccmtools.parser.idl.metamodel.BaseIDL.MContained; import ccmtools.ui.UserInterfaceDriver; import ccmtools.utils.Confix; Index: CppRemoteGenerator.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/CppRemoteGenerator.java,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** CppRemoteGenerator.java 4 Jan 2007 16:06:16 -0000 1.35 --- CppRemoteGenerator.java 19 Jan 2007 12:07:16 -0000 1.36 *************** *** 34,63 **** import ccmtools.CodeGenerator.Template; ! import ccmtools.metamodel.BaseIDL.MAliasDef; ! import ccmtools.metamodel.BaseIDL.MArrayDef; ! import ccmtools.metamodel.BaseIDL.MAttributeDef; ! import ccmtools.metamodel.BaseIDL.MContained; ! import ccmtools.metamodel.BaseIDL.MEnumDef; ! import ccmtools.metamodel.BaseIDL.MExceptionDef; ! import ccmtools.metamodel.BaseIDL.MFieldDef; ! import ccmtools.metamodel.BaseIDL.MFixedDef; ! import ccmtools.metamodel.BaseIDL.MIDLType; ! import ccmtools.metamodel.BaseIDL.MInterfaceDef; ! import ccmtools.metamodel.BaseIDL.MOperationDef; ! import ccmtools.metamodel.BaseIDL.MParameterDef; ! import ccmtools.metamodel.BaseIDL.MParameterMode; ! import ccmtools.metamodel.BaseIDL.MPrimitiveDef; ! import ccmtools.metamodel.BaseIDL.MPrimitiveKind; ! import ccmtools.metamodel.BaseIDL.MSequenceDef; ! import ccmtools.metamodel.BaseIDL.MStringDef; ! import ccmtools.metamodel.BaseIDL.MStructDef; ! import ccmtools.metamodel.BaseIDL.MTyped; ! import ccmtools.metamodel.BaseIDL.MTypedefDef; ! import ccmtools.metamodel.BaseIDL.MWstringDef; ! import ccmtools.metamodel.ComponentIDL.MComponentDef; ! import ccmtools.metamodel.ComponentIDL.MHomeDef; ! import ccmtools.metamodel.ComponentIDL.MProvidesDef; ! import ccmtools.metamodel.ComponentIDL.MSupportsDef; ! import ccmtools.metamodel.ComponentIDL.MUsesDef; import ccmtools.ui.UserInterfaceDriver; import ccmtools.utils.ConfigurationLocator; --- 34,63 ---- import ccmtools.CodeGenerator.Template; ! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MArrayDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MAttributeDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MContained; ! import ccmtools.parser.idl.metamodel.BaseIDL.MEnumDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MExceptionDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MFieldDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MFixedDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MIDLType; ! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MOperationDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterMode; ! import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveKind; ! import ccmtools.parser.idl.metamodel.BaseIDL.MSequenceDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MStringDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MStructDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MTyped; ! import ccmtools.parser.idl.metamodel.BaseIDL.MTypedefDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MWstringDef; ! import ccmtools.parser.idl.metamodel.ComponentIDL.MComponentDef; ! import ccmtools.parser.idl.metamodel.ComponentIDL.MHomeDef; ! import ccmtools.parser.idl.metamodel.ComponentIDL.MProvidesDef; ! import ccmtools.parser.idl.metamodel.ComponentIDL.MSupportsDef; ! import ccmtools.parser.idl.metamodel.ComponentIDL.MUsesDef; import ccmtools.ui.UserInterfaceDriver; import ccmtools.utils.ConfigurationLocator; |