Menu
▾
▴
ccmtools-cvs — Notification of CVS commits for the CCM Tools
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(86) |
Dec
(163) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(114) |
Feb
(254) |
Mar
(166) |
Apr
(122) |
May
(131) |
Jun
(59) |
Jul
(201) |
Aug
(85) |
Sep
(80) |
Oct
(64) |
Nov
(103) |
Dec
(36) |
| 2005 |
Jan
(231) |
Feb
(204) |
Mar
(71) |
Apr
(54) |
May
(50) |
Jun
(120) |
Jul
(17) |
Aug
(124) |
Sep
(75) |
Oct
(154) |
Nov
(37) |
Dec
(143) |
| 2006 |
Jan
(346) |
Feb
(170) |
Mar
|
Apr
|
May
(273) |
Jun
(113) |
Jul
(427) |
Aug
(570) |
Sep
(212) |
Oct
(550) |
Nov
(348) |
Dec
(314) |
| 2007 |
Jan
(709) |
Feb
(223) |
Mar
(104) |
Apr
(24) |
May
(11) |
Jun
(3) |
Jul
(5) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Teiniker E. <tei...@us...> - 2007-01-19 12:07:55
|
Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/struct In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4737/src-test/ccmtools/parser/idl/struct Modified Files: StructOfConstructedTypesTest.java StructTest.java StructOfTempleateTypesTest.java StructModuleTest.java StructOfBaseTypesTest.java StructDefinedInTest.java Log Message: Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel. Index: StructTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/struct/StructTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** StructTest.java 18 Jan 2007 17:11:47 -0000 1.3 --- StructTest.java 19 Jan 2007 12:07:17 -0000 1.4 *************** *** 7,20 **** import junit.framework.TestCase; import ccmtools.CcmtoolsException; - import ccmtools.metamodel.BaseIDL.MContained; - import ccmtools.metamodel.BaseIDL.MContainer; - import ccmtools.metamodel.BaseIDL.MFieldDef; - import ccmtools.metamodel.BaseIDL.MIDLType; - import ccmtools.metamodel.BaseIDL.MPrimitiveDef; - import ccmtools.metamodel.BaseIDL.MPrimitiveKind; - import ccmtools.metamodel.BaseIDL.MStringDef; - import ccmtools.metamodel.BaseIDL.MStructDef; - import ccmtools.metamodel.BaseIDL.MTyped; import ccmtools.parser.idl.ParserManager; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; --- 7,20 ---- import junit.framework.TestCase; import ccmtools.CcmtoolsException; import ccmtools.parser.idl.ParserManager; + import ccmtools.parser.idl.metamodel.BaseIDL.MContained; + import ccmtools.parser.idl.metamodel.BaseIDL.MContainer; + import ccmtools.parser.idl.metamodel.BaseIDL.MFieldDef; + import ccmtools.parser.idl.metamodel.BaseIDL.MIDLType; + import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveDef; + import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveKind; + import ccmtools.parser.idl.metamodel.BaseIDL.MStringDef; + import ccmtools.parser.idl.metamodel.BaseIDL.MStructDef; + import ccmtools.parser.idl.metamodel.BaseIDL.MTyped; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; Index: StructOfTempleateTypesTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/struct/StructOfTempleateTypesTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StructOfTempleateTypesTest.java 8 Nov 2006 10:31:49 -0000 1.1 --- StructOfTempleateTypesTest.java 19 Jan 2007 12:07:17 -0000 1.2 *************** *** 6,13 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MFieldDef; ! import ccmtools.metamodel.BaseIDL.MSequenceDef; ! import ccmtools.metamodel.BaseIDL.MStructDef; ! import ccmtools.metamodel.BaseIDL.MTyped; import ccmtools.parser.idl.primitive.PrimitiveTest; --- 6,13 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MFieldDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MSequenceDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MStructDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MTyped; import ccmtools.parser.idl.primitive.PrimitiveTest; Index: StructModuleTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/struct/StructModuleTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StructModuleTest.java 13 Nov 2006 17:00:50 -0000 1.1 --- StructModuleTest.java 19 Jan 2007 12:07:18 -0000 1.2 *************** *** 6,13 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.CcmModelHelper; ! import ccmtools.metamodel.BaseIDL.MFieldDef; ! import ccmtools.metamodel.BaseIDL.MModuleDef; ! import ccmtools.metamodel.BaseIDL.MStructDef; import ccmtools.parser.idl.module.ModuleTest; --- 6,13 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.CcmModelHelper; ! import ccmtools.parser.idl.metamodel.BaseIDL.MFieldDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MModuleDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MStructDef; import ccmtools.parser.idl.module.ModuleTest; Index: StructOfBaseTypesTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/struct/StructOfBaseTypesTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StructOfBaseTypesTest.java 8 Nov 2006 10:31:49 -0000 1.1 --- StructOfBaseTypesTest.java 19 Jan 2007 12:07:18 -0000 1.2 *************** *** 6,11 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MFieldDef; ! import ccmtools.metamodel.BaseIDL.MStructDef; import ccmtools.parser.idl.primitive.PrimitiveTest; --- 6,11 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MFieldDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MStructDef; import ccmtools.parser.idl.primitive.PrimitiveTest; Index: StructOfConstructedTypesTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/struct/StructOfConstructedTypesTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StructOfConstructedTypesTest.java 8 Nov 2006 10:31:48 -0000 1.1 --- StructOfConstructedTypesTest.java 19 Jan 2007 12:07:17 -0000 1.2 *************** *** 6,12 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; - import ccmtools.metamodel.BaseIDL.MFieldDef; - import ccmtools.metamodel.BaseIDL.MStructDef; import ccmtools.parser.idl.enumeration.EnumTest; import ccmtools.parser.idl.union.UnionTest; --- 6,12 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; import ccmtools.parser.idl.enumeration.EnumTest; + import ccmtools.parser.idl.metamodel.BaseIDL.MFieldDef; + import ccmtools.parser.idl.metamodel.BaseIDL.MStructDef; import ccmtools.parser.idl.union.UnionTest; Index: StructDefinedInTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/struct/StructDefinedInTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StructDefinedInTest.java 8 Nov 2006 10:31:49 -0000 1.1 --- StructDefinedInTest.java 19 Jan 2007 12:07:18 -0000 1.2 *************** *** 6,10 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MStructDef; --- 6,10 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MStructDef; |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 12:07:55
|
Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/constant In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4737/src-test/ccmtools/parser/idl/constant Modified Files: ConstantTest.java ConstantOfConstructedTypesTest.java ConstantDefinedInTest.java ConstantOfBaseTypesTest.java ConstantOfTemplateTypesTest.java Log Message: Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel. Index: ConstantOfConstructedTypesTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/constant/ConstantOfConstructedTypesTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ConstantOfConstructedTypesTest.java 8 Nov 2006 10:31:33 -0000 1.1 --- ConstantOfConstructedTypesTest.java 19 Jan 2007 12:07:19 -0000 1.2 *************** *** 6,13 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; - import ccmtools.metamodel.BaseIDL.MConstantDef; - import ccmtools.metamodel.BaseIDL.MEnumDef; import ccmtools.parser.idl.ScopedName; import ccmtools.parser.idl.enumeration.EnumTest; --- 6,13 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; import ccmtools.parser.idl.ScopedName; import ccmtools.parser.idl.enumeration.EnumTest; + import ccmtools.parser.idl.metamodel.BaseIDL.MConstantDef; + import ccmtools.parser.idl.metamodel.BaseIDL.MEnumDef; Index: ConstantOfTemplateTypesTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/constant/ConstantOfTemplateTypesTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ConstantOfTemplateTypesTest.java 8 Nov 2006 10:31:34 -0000 1.1 --- ConstantOfTemplateTypesTest.java 19 Jan 2007 12:07:20 -0000 1.2 *************** *** 6,12 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MConstantDef; ! import ccmtools.metamodel.BaseIDL.MStringDef; ! import ccmtools.metamodel.BaseIDL.MWstringDef; --- 6,12 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MConstantDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MStringDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MWstringDef; Index: ConstantOfBaseTypesTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/constant/ConstantOfBaseTypesTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ConstantOfBaseTypesTest.java 8 Nov 2006 10:31:34 -0000 1.1 --- ConstantOfBaseTypesTest.java 19 Jan 2007 12:07:19 -0000 1.2 *************** *** 6,12 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MConstantDef; ! import ccmtools.metamodel.BaseIDL.MPrimitiveDef; ! import ccmtools.metamodel.BaseIDL.MPrimitiveKind; public class ConstantOfBaseTypesTest extends ConstantTest --- 6,12 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MConstantDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveKind; public class ConstantOfBaseTypesTest extends ConstantTest Index: ConstantDefinedInTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/constant/ConstantDefinedInTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ConstantDefinedInTest.java 8 Nov 2006 10:31:34 -0000 1.1 --- ConstantDefinedInTest.java 19 Jan 2007 12:07:19 -0000 1.2 *************** *** 6,10 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MConstantDef; public class ConstantDefinedInTest extends ConstantTest --- 6,10 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MConstantDef; public class ConstantDefinedInTest extends ConstantTest Index: ConstantTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/constant/ConstantTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ConstantTest.java 18 Jan 2007 17:11:57 -0000 1.3 --- ConstantTest.java 19 Jan 2007 12:07:19 -0000 1.4 *************** *** 7,14 **** import junit.framework.TestCase; import ccmtools.CcmtoolsException; - import ccmtools.metamodel.BaseIDL.MConstantDef; - import ccmtools.metamodel.BaseIDL.MContained; - import ccmtools.metamodel.BaseIDL.MContainer; import ccmtools.parser.idl.ParserManager; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; --- 7,14 ---- import junit.framework.TestCase; import ccmtools.CcmtoolsException; import ccmtools.parser.idl.ParserManager; + import ccmtools.parser.idl.metamodel.BaseIDL.MConstantDef; + import ccmtools.parser.idl.metamodel.BaseIDL.MContained; + import ccmtools.parser.idl.metamodel.BaseIDL.MContainer; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 12:07:55
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl3 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4737/src/ccmtools/parser/idl3 Modified Files: DeclaratorHelper.java ParserHelper.java ParserManager.java Idl3SymbolTable.java idl3new.g Log Message: Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel. Index: DeclaratorHelper.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl3/DeclaratorHelper.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DeclaratorHelper.java 10 Aug 2006 20:21:56 -0000 1.3 --- DeclaratorHelper.java 19 Jan 2007 12:06:50 -0000 1.4 *************** *** 21,25 **** package ccmtools.parser.idl3; ! import ccmtools.metamodel.BaseIDL.MArrayDef; class DeclaratorHelper --- 21,25 ---- package ccmtools.parser.idl3; ! import ccmtools.parser.idl.metamodel.BaseIDL.MArrayDef; class DeclaratorHelper Index: ParserManager.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl3/ParserManager.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ParserManager.java 21 Aug 2006 15:47:49 -0000 1.5 --- ParserManager.java 19 Jan 2007 12:06:50 -0000 1.6 *************** *** 28,32 **** import antlr.RecognitionException; import antlr.TokenStreamException; ! import ccmtools.metamodel.BaseIDL.MContainer; public class ParserManager --- 28,32 ---- import antlr.RecognitionException; import antlr.TokenStreamException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MContainer; public class ParserManager Index: ParserHelper.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl3/ParserHelper.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ParserHelper.java 28 Sep 2006 13:52:42 -0000 1.4 --- ParserHelper.java 19 Jan 2007 12:06:50 -0000 1.5 *************** *** 10,33 **** import antlr.TokenStreamException; ! import ccmtools.metamodel.BaseIDL.MContained; ! import ccmtools.metamodel.BaseIDL.MContainedImpl; ! import ccmtools.metamodel.BaseIDL.MContainer; ! 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.MModuleDef; ! import ccmtools.metamodel.BaseIDL.MOperationDef; ! import ccmtools.metamodel.BaseIDL.MParameterDef; ! import ccmtools.metamodel.BaseIDL.MStructDef; ! import ccmtools.metamodel.BaseIDL.MTyped; ! import ccmtools.metamodel.BaseIDL.MUnionDef; ! import ccmtools.metamodel.BaseIDL.MUnionFieldDef; ! import ccmtools.metamodel.BaseIDL.MValueDef; ! import ccmtools.metamodel.ComponentIDL.MComponentDef; ! import ccmtools.metamodel.ComponentIDL.MHomeDef; ! import ccmtools.metamodel.ComponentIDL.MSupportsDef; ! import ccmtools.metamodel.ComponentIDL.MSupportsDefImpl; public class ParserHelper --- 10,33 ---- import antlr.TokenStreamException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MContained; ! import ccmtools.parser.idl.metamodel.BaseIDL.MContainedImpl; ! import ccmtools.parser.idl.metamodel.BaseIDL.MContainer; ! 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.MModuleDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MOperationDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MStructDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MTyped; ! import ccmtools.parser.idl.metamodel.BaseIDL.MUnionDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MUnionFieldDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MValueDef; ! import ccmtools.parser.idl.metamodel.ComponentIDL.MComponentDef; ! import ccmtools.parser.idl.metamodel.ComponentIDL.MHomeDef; ! import ccmtools.parser.idl.metamodel.ComponentIDL.MSupportsDef; ! import ccmtools.parser.idl.metamodel.ComponentIDL.MSupportsDefImpl; public class ParserHelper Index: Idl3SymbolTable.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl3/Idl3SymbolTable.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Idl3SymbolTable.java 10 Aug 2006 20:21:56 -0000 1.2 --- Idl3SymbolTable.java 19 Jan 2007 12:06:50 -0000 1.3 *************** *** 34,38 **** import java.util.TreeSet; ! import ccmtools.metamodel.BaseIDL.MContained; public class Idl3SymbolTable --- 34,38 ---- import java.util.TreeSet; ! import ccmtools.parser.idl.metamodel.BaseIDL.MContained; public class Idl3SymbolTable Index: idl3new.g =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl3/idl3new.g,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** idl3new.g 26 Sep 2006 09:36:38 -0000 1.11 --- idl3new.g 19 Jan 2007 12:06:50 -0000 1.12 *************** *** 53,58 **** import java.util.Map; ! import ccmtools.metamodel.BaseIDL.*; ! import ccmtools.metamodel.ComponentIDL.*; } --- 53,58 ---- import java.util.Map; ! import ccmtools.parser.idl.metamodel.BaseIDL.*; ! import ccmtools.parser.idl.metamodel.ComponentIDL.*; } |
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; |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 12:07:54
|
Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/literal In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4737/src-test/ccmtools/parser/idl/literal Modified Files: LiteralOfTemplateTypesTest.java LiteralTest.java LiteralOfBaseTypesTest.java Log Message: Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel. Index: LiteralOfTemplateTypesTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/literal/LiteralOfTemplateTypesTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LiteralOfTemplateTypesTest.java 8 Nov 2006 10:31:46 -0000 1.1 --- LiteralOfTemplateTypesTest.java 19 Jan 2007 12:07:19 -0000 1.2 *************** *** 6,12 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MConstantDef; ! import ccmtools.metamodel.BaseIDL.MStringDef; ! import ccmtools.metamodel.BaseIDL.MWstringDef; --- 6,12 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MConstantDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MStringDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MWstringDef; Index: LiteralTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/literal/LiteralTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LiteralTest.java 18 Jan 2007 17:11:56 -0000 1.2 --- LiteralTest.java 19 Jan 2007 12:07:19 -0000 1.3 *************** *** 6,12 **** import junit.framework.TestCase; import ccmtools.CcmtoolsException; - import ccmtools.metamodel.BaseIDL.MConstantDef; - import ccmtools.metamodel.BaseIDL.MContainer; import ccmtools.parser.idl.ParserManager; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; --- 6,12 ---- import junit.framework.TestCase; import ccmtools.CcmtoolsException; import ccmtools.parser.idl.ParserManager; + import ccmtools.parser.idl.metamodel.BaseIDL.MConstantDef; + import ccmtools.parser.idl.metamodel.BaseIDL.MContainer; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; Index: LiteralOfBaseTypesTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/literal/LiteralOfBaseTypesTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LiteralOfBaseTypesTest.java 8 Nov 2006 10:31:46 -0000 1.1 --- LiteralOfBaseTypesTest.java 19 Jan 2007 12:07:19 -0000 1.2 *************** *** 6,10 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MConstantDef; --- 6,10 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MConstantDef; |
Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4737/src-test/ccmtools/parser/idl/valuetype Modified Files: ValuetypeOperationOfConstructedTypesTest.java ValuetypeOperationOfTemplateTypesTest.java ValuetypeAttributeOfTemplateTypesTest.java ValuetypeMemberOfConstructedTypeTest.java ValuetypeMemberVisibilityTest.java ValuetypeTest.java ValuetypeAttributeOfBaseTypesTest.java ValuetypeOperationOfBaseTypesTest.java ValuetypeMemberOfTemplateTypeTest.java AbstractValuetypeAttributeOfBaseTypesTest.java ValuetypeDefinedInTest.java ValueBoxTest.java ValuetypeFactoryTest.java ValuetypeForwardDeclarationTest.java ValuetypeTypesTest.java ValuetypeHeaderTest.java ValuetypeMemberListTest.java AbstractValuetypeTest.java ValuetypeAttributeOfConstructedTypesTest.java ValuetypeMemberOfBaseTypeTest.java Log Message: Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel. Index: ValuetypeMemberVisibilityTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype/ValuetypeMemberVisibilityTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ValuetypeMemberVisibilityTest.java 8 Nov 2006 10:31:34 -0000 1.1 --- ValuetypeMemberVisibilityTest.java 19 Jan 2007 12:07:11 -0000 1.2 *************** *** 6,11 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MValueDef; ! import ccmtools.metamodel.BaseIDL.MValueMemberDef; import ccmtools.parser.idl.primitive.PrimitiveTest; --- 6,11 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MValueDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MValueMemberDef; import ccmtools.parser.idl.primitive.PrimitiveTest; Index: ValuetypeAttributeOfBaseTypesTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype/ValuetypeAttributeOfBaseTypesTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ValuetypeAttributeOfBaseTypesTest.java 8 Nov 2006 10:31:34 -0000 1.1 --- ValuetypeAttributeOfBaseTypesTest.java 19 Jan 2007 12:07:11 -0000 1.2 *************** *** 6,10 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.primitive.PrimitiveTest; --- 6,10 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.primitive.PrimitiveTest; Index: ValuetypeAttributeOfTemplateTypesTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype/ValuetypeAttributeOfTemplateTypesTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ValuetypeAttributeOfTemplateTypesTest.java 8 Nov 2006 10:31:34 -0000 1.1 --- ValuetypeAttributeOfTemplateTypesTest.java 19 Jan 2007 12:07:11 -0000 1.2 *************** *** 6,10 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.primitive.PrimitiveTest; import ccmtools.parser.idl.sequence.SequenceTest; --- 6,10 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.primitive.PrimitiveTest; import ccmtools.parser.idl.sequence.SequenceTest; Index: ValuetypeMemberOfBaseTypeTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype/ValuetypeMemberOfBaseTypeTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ValuetypeMemberOfBaseTypeTest.java 8 Nov 2006 10:31:34 -0000 1.1 --- ValuetypeMemberOfBaseTypeTest.java 19 Jan 2007 12:07:12 -0000 1.2 *************** *** 6,10 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.primitive.PrimitiveTest; --- 6,10 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.primitive.PrimitiveTest; Index: ValuetypeMemberListTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype/ValuetypeMemberListTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ValuetypeMemberListTest.java 8 Nov 2006 10:31:35 -0000 1.1 --- ValuetypeMemberListTest.java 19 Jan 2007 12:07:12 -0000 1.2 *************** *** 6,10 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.primitive.PrimitiveTest; --- 6,10 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.primitive.PrimitiveTest; Index: AbstractValuetypeAttributeOfBaseTypesTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype/AbstractValuetypeAttributeOfBaseTypesTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AbstractValuetypeAttributeOfBaseTypesTest.java 8 Nov 2006 10:31:34 -0000 1.1 --- AbstractValuetypeAttributeOfBaseTypesTest.java 19 Jan 2007 12:07:11 -0000 1.2 *************** *** 6,10 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.primitive.PrimitiveTest; --- 6,10 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.primitive.PrimitiveTest; Index: ValuetypeDefinedInTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype/ValuetypeDefinedInTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ValuetypeDefinedInTest.java 8 Nov 2006 10:31:34 -0000 1.1 --- ValuetypeDefinedInTest.java 19 Jan 2007 12:07:11 -0000 1.2 *************** *** 6,10 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MValueDef; --- 6,10 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MValueDef; Index: ValuetypeHeaderTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype/ValuetypeHeaderTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ValuetypeHeaderTest.java 8 Nov 2006 10:31:34 -0000 1.1 --- ValuetypeHeaderTest.java 19 Jan 2007 12:07:12 -0000 1.2 *************** *** 6,11 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MInterfaceDef; ! import ccmtools.metamodel.BaseIDL.MValueDef; --- 6,11 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MValueDef; Index: ValuetypeMemberOfConstructedTypeTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype/ValuetypeMemberOfConstructedTypeTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ValuetypeMemberOfConstructedTypeTest.java 8 Nov 2006 10:31:34 -0000 1.1 --- ValuetypeMemberOfConstructedTypeTest.java 19 Jan 2007 12:07:11 -0000 1.2 *************** *** 6,11 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; - import ccmtools.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.enumeration.EnumTest; import ccmtools.parser.idl.struct.StructTest; import ccmtools.parser.idl.union.UnionTest; --- 6,11 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; import ccmtools.parser.idl.enumeration.EnumTest; + import ccmtools.parser.idl.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.struct.StructTest; import ccmtools.parser.idl.union.UnionTest; Index: ValuetypeAttributeOfConstructedTypesTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype/ValuetypeAttributeOfConstructedTypesTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ValuetypeAttributeOfConstructedTypesTest.java 8 Nov 2006 10:31:34 -0000 1.1 --- ValuetypeAttributeOfConstructedTypesTest.java 19 Jan 2007 12:07:12 -0000 1.2 *************** *** 6,11 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; - import ccmtools.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.enumeration.EnumTest; import ccmtools.parser.idl.struct.StructTest; import ccmtools.parser.idl.union.UnionTest; --- 6,11 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; import ccmtools.parser.idl.enumeration.EnumTest; + import ccmtools.parser.idl.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.struct.StructTest; import ccmtools.parser.idl.union.UnionTest; Index: ValuetypeOperationOfConstructedTypesTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype/ValuetypeOperationOfConstructedTypesTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ValuetypeOperationOfConstructedTypesTest.java 8 Nov 2006 10:31:34 -0000 1.1 --- ValuetypeOperationOfConstructedTypesTest.java 19 Jan 2007 12:07:10 -0000 1.2 *************** *** 6,13 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; - import ccmtools.metamodel.BaseIDL.MOperationDef; - import ccmtools.metamodel.BaseIDL.MParameterMode; - import ccmtools.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.enumeration.EnumTest; import ccmtools.parser.idl.struct.StructTest; import ccmtools.parser.idl.union.UnionTest; --- 6,13 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; import ccmtools.parser.idl.enumeration.EnumTest; + import ccmtools.parser.idl.metamodel.BaseIDL.MOperationDef; + import ccmtools.parser.idl.metamodel.BaseIDL.MParameterMode; + import ccmtools.parser.idl.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.struct.StructTest; import ccmtools.parser.idl.union.UnionTest; Index: ValuetypeOperationOfBaseTypesTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype/ValuetypeOperationOfBaseTypesTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ValuetypeOperationOfBaseTypesTest.java 8 Nov 2006 10:31:34 -0000 1.1 --- ValuetypeOperationOfBaseTypesTest.java 19 Jan 2007 12:07:11 -0000 1.2 *************** *** 6,12 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MOperationDef; ! import ccmtools.metamodel.BaseIDL.MParameterMode; ! import ccmtools.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.primitive.PrimitiveTest; --- 6,12 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MOperationDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterMode; ! import ccmtools.parser.idl.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.primitive.PrimitiveTest; Index: ValuetypeFactoryTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype/ValuetypeFactoryTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ValuetypeFactoryTest.java 8 Nov 2006 10:31:35 -0000 1.1 --- ValuetypeFactoryTest.java 19 Jan 2007 12:07:12 -0000 1.2 *************** *** 6,11 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MValueDef; ! import ccmtools.metamodel.ComponentIDL.MFactoryDef; import ccmtools.parser.idl.primitive.PrimitiveTest; import ccmtools.parser.idl.struct.StructTest; --- 6,11 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MValueDef; ! import ccmtools.parser.idl.metamodel.ComponentIDL.MFactoryDef; import ccmtools.parser.idl.primitive.PrimitiveTest; import ccmtools.parser.idl.struct.StructTest; Index: ValuetypeTypesTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype/ValuetypeTypesTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ValuetypeTypesTest.java 8 Nov 2006 10:31:34 -0000 1.1 --- ValuetypeTypesTest.java 19 Jan 2007 12:07:12 -0000 1.2 *************** *** 6,24 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; - import ccmtools.metamodel.BaseIDL.MAliasDef; - import ccmtools.metamodel.BaseIDL.MConstantDef; - import ccmtools.metamodel.BaseIDL.MEnumDef; - import ccmtools.metamodel.BaseIDL.MExceptionDef; - import ccmtools.metamodel.BaseIDL.MPrimitiveDef; - import ccmtools.metamodel.BaseIDL.MPrimitiveKind; - import ccmtools.metamodel.BaseIDL.MStringDef; - import ccmtools.metamodel.BaseIDL.MStructDef; - import ccmtools.metamodel.BaseIDL.MTyped; - import ccmtools.metamodel.BaseIDL.MUnionDef; - import ccmtools.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.ScopedName; import ccmtools.parser.idl.constant.ConstantTest; import ccmtools.parser.idl.enumeration.EnumTest; import ccmtools.parser.idl.exception.ExceptionTest; import ccmtools.parser.idl.primitive.PrimitiveTest; import ccmtools.parser.idl.sequence.SequenceTest; --- 6,24 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; import ccmtools.parser.idl.ScopedName; import ccmtools.parser.idl.constant.ConstantTest; import ccmtools.parser.idl.enumeration.EnumTest; import ccmtools.parser.idl.exception.ExceptionTest; + import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef; + import ccmtools.parser.idl.metamodel.BaseIDL.MConstantDef; + import ccmtools.parser.idl.metamodel.BaseIDL.MEnumDef; + import ccmtools.parser.idl.metamodel.BaseIDL.MExceptionDef; + import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveDef; + import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveKind; + 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.MUnionDef; + import ccmtools.parser.idl.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.primitive.PrimitiveTest; import ccmtools.parser.idl.sequence.SequenceTest; Index: ValuetypeMemberOfTemplateTypeTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype/ValuetypeMemberOfTemplateTypeTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ValuetypeMemberOfTemplateTypeTest.java 8 Nov 2006 10:31:35 -0000 1.1 --- ValuetypeMemberOfTemplateTypeTest.java 19 Jan 2007 12:07:11 -0000 1.2 *************** *** 6,11 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MSequenceDef; ! import ccmtools.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.primitive.PrimitiveTest; import ccmtools.parser.idl.sequence.SequenceTest; --- 6,11 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MSequenceDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.primitive.PrimitiveTest; import ccmtools.parser.idl.sequence.SequenceTest; Index: ValueBoxTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype/ValueBoxTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ValueBoxTest.java 8 Nov 2006 10:31:34 -0000 1.1 --- ValueBoxTest.java 19 Jan 2007 12:07:11 -0000 1.2 *************** *** 6,11 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MSequenceDef; ! import ccmtools.metamodel.BaseIDL.MValueBoxDef; import ccmtools.parser.idl.primitive.PrimitiveTest; import ccmtools.parser.idl.struct.StructTest; --- 6,11 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MSequenceDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MValueBoxDef; import ccmtools.parser.idl.primitive.PrimitiveTest; import ccmtools.parser.idl.struct.StructTest; Index: ValuetypeOperationOfTemplateTypesTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype/ValuetypeOperationOfTemplateTypesTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ValuetypeOperationOfTemplateTypesTest.java 8 Nov 2006 10:31:35 -0000 1.1 --- ValuetypeOperationOfTemplateTypesTest.java 19 Jan 2007 12:07:11 -0000 1.2 *************** *** 6,12 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MOperationDef; ! import ccmtools.metamodel.BaseIDL.MParameterMode; ! import ccmtools.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.primitive.PrimitiveTest; import ccmtools.parser.idl.sequence.SequenceTest; --- 6,12 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MOperationDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterMode; ! import ccmtools.parser.idl.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.primitive.PrimitiveTest; import ccmtools.parser.idl.sequence.SequenceTest; Index: AbstractValuetypeTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype/AbstractValuetypeTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AbstractValuetypeTest.java 8 Nov 2006 10:31:34 -0000 1.1 --- AbstractValuetypeTest.java 19 Jan 2007 12:07:12 -0000 1.2 *************** *** 6,10 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MValueDef; --- 6,10 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MValueDef; Index: ValuetypeForwardDeclarationTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype/ValuetypeForwardDeclarationTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ValuetypeForwardDeclarationTest.java 8 Nov 2006 10:31:34 -0000 1.1 --- ValuetypeForwardDeclarationTest.java 19 Jan 2007 12:07:12 -0000 1.2 *************** *** 6,10 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.primitive.PrimitiveTest; --- 6,10 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MValueDef; import ccmtools.parser.idl.primitive.PrimitiveTest; Index: ValuetypeTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype/ValuetypeTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ValuetypeTest.java 18 Jan 2007 17:11:52 -0000 1.2 --- ValuetypeTest.java 19 Jan 2007 12:07:11 -0000 1.3 *************** *** 7,24 **** import junit.framework.TestCase; import ccmtools.CcmtoolsException; - import ccmtools.metamodel.BaseIDL.MAttributeDef; - import ccmtools.metamodel.BaseIDL.MContained; - import ccmtools.metamodel.BaseIDL.MContainer; - 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.MTyped; - import ccmtools.metamodel.BaseIDL.MValueBoxDef; - import ccmtools.metamodel.BaseIDL.MValueDef; - import ccmtools.metamodel.BaseIDL.MValueMemberDef; - import ccmtools.metamodel.ComponentIDL.MFactoryDef; import ccmtools.parser.idl.ParserManager; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; --- 7,24 ---- import junit.framework.TestCase; import ccmtools.CcmtoolsException; import ccmtools.parser.idl.ParserManager; + 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.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.MTyped; + import ccmtools.parser.idl.metamodel.BaseIDL.MValueBoxDef; + import ccmtools.parser.idl.metamodel.BaseIDL.MValueDef; + import ccmtools.parser.idl.metamodel.BaseIDL.MValueMemberDef; + import ccmtools.parser.idl.metamodel.ComponentIDL.MFactoryDef; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 12:07:51
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4737/src/ccmtools Modified Files: Constants.java Log Message: Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel. Index: Constants.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/Constants.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Constants.java 15 Jan 2007 15:00:14 -0000 1.21 --- Constants.java 19 Jan 2007 12:07:17 -0000 1.22 *************** *** 24,28 **** { public static final String PACKAGE = "ccmtools"; ! public static final String VERSION = "0.8.4"; public static final String CPP_PATH = "cpp"; --- 24,28 ---- { public static final String PACKAGE = "ccmtools"; ! public static final String VERSION = "0.8.5"; public static final String CPP_PATH = "cpp"; |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 12:07:39
|
Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/array In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4737/src-test/ccmtools/parser/idl/array Modified Files: ArrayOfConstructedTypesTest.java ArrayDimensionsTest.java ArrayOfTemplateTypesTest.java ArrayDefinedInTest.java ArrayOfBaseTypesTest.java ArrayTest.java Log Message: Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel. Index: ArrayDefinedInTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/array/ArrayDefinedInTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ArrayDefinedInTest.java 8 Nov 2006 10:31:33 -0000 1.1 --- ArrayDefinedInTest.java 19 Jan 2007 12:06:29 -0000 1.2 *************** *** 6,10 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MAliasDef; --- 6,10 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef; Index: ArrayTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/array/ArrayTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ArrayTest.java 18 Jan 2007 17:11:58 -0000 1.2 --- ArrayTest.java 19 Jan 2007 12:06:30 -0000 1.3 *************** *** 6,12 **** import junit.framework.TestCase; import ccmtools.CcmtoolsException; - import ccmtools.metamodel.BaseIDL.MAliasDef; - import ccmtools.metamodel.BaseIDL.MContainer; import ccmtools.parser.idl.ParserManager; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; --- 6,12 ---- import junit.framework.TestCase; import ccmtools.CcmtoolsException; import ccmtools.parser.idl.ParserManager; + import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef; + import ccmtools.parser.idl.metamodel.BaseIDL.MContainer; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; Index: ArrayDimensionsTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/array/ArrayDimensionsTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ArrayDimensionsTest.java 8 Nov 2006 10:31:33 -0000 1.1 --- ArrayDimensionsTest.java 19 Jan 2007 12:06:29 -0000 1.2 *************** *** 6,12 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MAliasDef; ! import ccmtools.metamodel.BaseIDL.MArrayDef; ! import ccmtools.metamodel.BaseIDL.MTyped; import ccmtools.parser.idl.primitive.PrimitiveTest; --- 6,12 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MArrayDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MTyped; import ccmtools.parser.idl.primitive.PrimitiveTest; Index: ArrayOfConstructedTypesTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/array/ArrayOfConstructedTypesTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ArrayOfConstructedTypesTest.java 8 Nov 2006 10:31:33 -0000 1.1 --- ArrayOfConstructedTypesTest.java 19 Jan 2007 12:06:29 -0000 1.2 *************** *** 6,15 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; - import ccmtools.metamodel.BaseIDL.MAliasDef; - import ccmtools.metamodel.BaseIDL.MArrayDef; - import ccmtools.metamodel.BaseIDL.MEnumDef; - import ccmtools.metamodel.BaseIDL.MStructDef; - import ccmtools.metamodel.BaseIDL.MUnionDef; import ccmtools.parser.idl.enumeration.EnumTest; import ccmtools.parser.idl.struct.StructTest; import ccmtools.parser.idl.union.UnionTest; --- 6,15 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; import ccmtools.parser.idl.enumeration.EnumTest; + import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef; + import ccmtools.parser.idl.metamodel.BaseIDL.MArrayDef; + import ccmtools.parser.idl.metamodel.BaseIDL.MEnumDef; + import ccmtools.parser.idl.metamodel.BaseIDL.MStructDef; + import ccmtools.parser.idl.metamodel.BaseIDL.MUnionDef; import ccmtools.parser.idl.struct.StructTest; import ccmtools.parser.idl.union.UnionTest; Index: ArrayOfTemplateTypesTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/array/ArrayOfTemplateTypesTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ArrayOfTemplateTypesTest.java 8 Nov 2006 10:31:33 -0000 1.1 --- ArrayOfTemplateTypesTest.java 19 Jan 2007 12:06:29 -0000 1.2 *************** *** 6,13 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MAliasDef; ! import ccmtools.metamodel.BaseIDL.MArrayDef; ! import ccmtools.metamodel.BaseIDL.MSequenceDef; ! import ccmtools.metamodel.BaseIDL.MTyped; import ccmtools.parser.idl.primitive.PrimitiveTest; --- 6,13 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MArrayDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MSequenceDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MTyped; import ccmtools.parser.idl.primitive.PrimitiveTest; Index: ArrayOfBaseTypesTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/array/ArrayOfBaseTypesTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ArrayOfBaseTypesTest.java 8 Nov 2006 10:31:33 -0000 1.1 --- ArrayOfBaseTypesTest.java 19 Jan 2007 12:06:30 -0000 1.2 *************** *** 6,12 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MAliasDef; ! import ccmtools.metamodel.BaseIDL.MArrayDef; ! import ccmtools.metamodel.BaseIDL.MTyped; import ccmtools.parser.idl.primitive.PrimitiveTest; --- 6,12 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MArrayDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MTyped; import ccmtools.parser.idl.primitive.PrimitiveTest; |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 12:07:39
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/CodeGenerator In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4737/src/ccmtools/CodeGenerator Modified Files: CcmGraphTraverser.java GraphTraverser.java CodeGenerator.java Log Message: Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel. Index: CcmGraphTraverser.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CodeGenerator/CcmGraphTraverser.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CcmGraphTraverser.java 24 Nov 2006 14:48:16 -0000 1.4 --- CcmGraphTraverser.java 19 Jan 2007 12:06:30 -0000 1.5 *************** *** 29,38 **** import java.util.Set; ! import ccmtools.metamodel.BaseIDL.MContained; ! import ccmtools.metamodel.BaseIDL.MEnumDef; ! import ccmtools.metamodel.BaseIDL.MFieldDef; ! import ccmtools.metamodel.BaseIDL.MModuleDef; ! import ccmtools.metamodel.BaseIDL.MParameterDef; ! import ccmtools.metamodel.BaseIDL.MUnionFieldDef; /** --- 29,38 ---- import java.util.Set; ! import ccmtools.parser.idl.metamodel.BaseIDL.MContained; ! import ccmtools.parser.idl.metamodel.BaseIDL.MEnumDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MFieldDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MModuleDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MUnionFieldDef; /** Index: GraphTraverser.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CodeGenerator/GraphTraverser.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GraphTraverser.java 10 Aug 2006 20:21:59 -0000 1.2 --- GraphTraverser.java 19 Jan 2007 12:06:30 -0000 1.3 *************** *** 21,25 **** package ccmtools.CodeGenerator; ! import ccmtools.metamodel.BaseIDL.MContained; import java.util.List; --- 21,25 ---- package ccmtools.CodeGenerator; ! import ccmtools.parser.idl.metamodel.BaseIDL.MContained; import java.util.List; Index: CodeGenerator.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CodeGenerator/CodeGenerator.java,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** CodeGenerator.java 6 Dec 2006 20:49:23 -0000 1.32 --- CodeGenerator.java 19 Jan 2007 12:06:30 -0000 1.33 *************** *** 43,72 **** import java.util.logging.Logger; ! import ccmtools.metamodel.CcmModelHelper; ! import ccmtools.metamodel.BaseIDL.MAttributeDef; ! import ccmtools.metamodel.BaseIDL.MContained; ! import ccmtools.metamodel.BaseIDL.MContainer; ! import ccmtools.metamodel.BaseIDL.MExceptionDef; ! import ccmtools.metamodel.BaseIDL.MFixedDef; ! import ccmtools.metamodel.BaseIDL.MIDLType; ! import ccmtools.metamodel.BaseIDL.MInterfaceDef; ! import ccmtools.metamodel.BaseIDL.MModuleDef; ! import ccmtools.metamodel.BaseIDL.MPrimitiveDef; ! import ccmtools.metamodel.BaseIDL.MPrimitiveKind; ! 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.MConsumesDef; ! import ccmtools.metamodel.ComponentIDL.MEmitsDef; ! import ccmtools.metamodel.ComponentIDL.MEventPortDef; ! import ccmtools.metamodel.ComponentIDL.MFactoryDef; ! import ccmtools.metamodel.ComponentIDL.MFinderDef; ! import ccmtools.metamodel.ComponentIDL.MHomeDef; ! import ccmtools.metamodel.ComponentIDL.MProvidesDef; ! import ccmtools.metamodel.ComponentIDL.MPublishesDef; ! import ccmtools.metamodel.ComponentIDL.MSupportsDef; ! import ccmtools.metamodel.ComponentIDL.MUsesDef; import ccmtools.ui.UserInterfaceDriver; import ccmtools.utils.Text; --- 43,72 ---- import java.util.logging.Logger; ! import ccmtools.parser.idl.metamodel.CcmModelHelper; ! 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.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.MModuleDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveKind; ! 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.MConsumesDef; ! import ccmtools.parser.idl.metamodel.ComponentIDL.MEmitsDef; ! import ccmtools.parser.idl.metamodel.ComponentIDL.MEventPortDef; ! 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.MPublishesDef; ! import ccmtools.parser.idl.metamodel.ComponentIDL.MSupportsDef; ! import ccmtools.parser.idl.metamodel.ComponentIDL.MUsesDef; import ccmtools.ui.UserInterfaceDriver; import ccmtools.utils.Text; |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 12:07:37
|
Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl3 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4737/src-test/ccmtools/parser/idl3 Modified Files: Idl3ParserTest.java Log Message: Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel. Index: Idl3ParserTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl3/Idl3ParserTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Idl3ParserTest.java 8 Nov 2006 10:31:55 -0000 1.1 --- Idl3ParserTest.java 19 Jan 2007 12:07:32 -0000 1.2 *************** *** 8,18 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.CcmModelHelper; ! import ccmtools.metamodel.BaseIDL.MContainer; ! import ccmtools.metamodel.BaseIDL.MFieldDef; ! import ccmtools.metamodel.BaseIDL.MPrimitiveDef; ! import ccmtools.metamodel.BaseIDL.MPrimitiveKind; ! import ccmtools.metamodel.BaseIDL.MStringDef; ! import ccmtools.metamodel.BaseIDL.MStructDef; import ccmtools.test.CcmtoolsTestCase; import ccmtools.ui.UserInterfaceDriver; --- 8,18 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.CcmModelHelper; ! import ccmtools.parser.idl.metamodel.BaseIDL.MContainer; ! import ccmtools.parser.idl.metamodel.BaseIDL.MFieldDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveKind; ! import ccmtools.parser.idl.metamodel.BaseIDL.MStringDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MStructDef; import ccmtools.test.CcmtoolsTestCase; import ccmtools.ui.UserInterfaceDriver; |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 12:07:37
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/ui In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4737/src/ccmtools/ui Modified Files: Main.java Log Message: Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel. Index: Main.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/ui/Main.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Main.java 18 Dec 2006 21:34:20 -0000 1.5 --- Main.java 19 Jan 2007 12:07:31 -0000 1.6 *************** *** 38,43 **** import ccmtools.CppGenerator.CppRemoteGenerator; import ccmtools.CppGenerator.CppRemoteTestGenerator; ! import ccmtools.metamodel.CcmModelHelper; ! import ccmtools.metamodel.BaseIDL.MContainer; import ccmtools.parser.idl3.ParserManager; import ccmtools.utils.ConfigurationLocator; --- 38,43 ---- import ccmtools.CppGenerator.CppRemoteGenerator; import ccmtools.CppGenerator.CppRemoteTestGenerator; ! import ccmtools.parser.idl.metamodel.CcmModelHelper; ! import ccmtools.parser.idl.metamodel.BaseIDL.MContainer; import ccmtools.parser.idl3.ParserManager; import ccmtools.utils.ConfigurationLocator; |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 12:07:37
|
Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/module In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4737/src-test/ccmtools/parser/idl/module Modified Files: ModuleTest.java ModuleReopenTest.java Log Message: Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel. Index: ModuleTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/module/ModuleTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ModuleTest.java 18 Jan 2007 17:11:57 -0000 1.3 --- ModuleTest.java 19 Jan 2007 12:07:30 -0000 1.4 *************** *** 9,16 **** import junit.framework.TestCase; import ccmtools.CcmtoolsException; - import ccmtools.metamodel.BaseIDL.MContained; - import ccmtools.metamodel.BaseIDL.MContainer; - import ccmtools.metamodel.BaseIDL.MModuleDef; import ccmtools.parser.idl.ParserManager; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; --- 9,16 ---- import junit.framework.TestCase; import ccmtools.CcmtoolsException; import ccmtools.parser.idl.ParserManager; + import ccmtools.parser.idl.metamodel.BaseIDL.MContained; + import ccmtools.parser.idl.metamodel.BaseIDL.MContainer; + import ccmtools.parser.idl.metamodel.BaseIDL.MModuleDef; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; Index: ModuleReopenTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/module/ModuleReopenTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ModuleReopenTest.java 24 Nov 2006 14:48:17 -0000 1.1 --- ModuleReopenTest.java 19 Jan 2007 12:07:30 -0000 1.2 *************** *** 7,13 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.CcmModelHelper; ! import ccmtools.metamodel.BaseIDL.MInterfaceDef; ! import ccmtools.metamodel.BaseIDL.MModuleDef; --- 7,13 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.CcmModelHelper; ! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MModuleDef; |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 12:07:37
|
Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/union In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4737/src-test/ccmtools/parser/idl/union Modified Files: UnionDiscriminatorTest.java UnionDefinedInTest.java UnionTest.java Log Message: Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel. Index: UnionDefinedInTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/union/UnionDefinedInTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** UnionDefinedInTest.java 8 Nov 2006 10:31:53 -0000 1.1 --- UnionDefinedInTest.java 19 Jan 2007 12:07:30 -0000 1.2 *************** *** 6,10 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MUnionDef; --- 6,10 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MUnionDef; Index: UnionTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/union/UnionTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** UnionTest.java 18 Jan 2007 17:11:47 -0000 1.2 --- UnionTest.java 19 Jan 2007 12:07:30 -0000 1.3 *************** *** 9,19 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; - import ccmtools.metamodel.BaseIDL.MContained; - import ccmtools.metamodel.BaseIDL.MContainer; - import ccmtools.metamodel.BaseIDL.MIDLType; - import ccmtools.metamodel.BaseIDL.MTyped; - import ccmtools.metamodel.BaseIDL.MUnionDef; - import ccmtools.metamodel.BaseIDL.MUnionFieldDef; import ccmtools.parser.idl.ParserManager; import ccmtools.parser.idl.primitive.PrimitiveTest; import ccmtools.ui.ConsoleDriver; --- 9,19 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; import ccmtools.parser.idl.ParserManager; + import ccmtools.parser.idl.metamodel.BaseIDL.MContained; + import ccmtools.parser.idl.metamodel.BaseIDL.MContainer; + import ccmtools.parser.idl.metamodel.BaseIDL.MIDLType; + import ccmtools.parser.idl.metamodel.BaseIDL.MTyped; + import ccmtools.parser.idl.metamodel.BaseIDL.MUnionDef; + import ccmtools.parser.idl.metamodel.BaseIDL.MUnionFieldDef; import ccmtools.parser.idl.primitive.PrimitiveTest; import ccmtools.ui.ConsoleDriver; Index: UnionDiscriminatorTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/union/UnionDiscriminatorTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** UnionDiscriminatorTest.java 8 Nov 2006 10:31:53 -0000 1.1 --- UnionDiscriminatorTest.java 19 Jan 2007 12:07:30 -0000 1.2 *************** *** 7,14 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; - import ccmtools.metamodel.BaseIDL.MUnionDef; - import ccmtools.metamodel.BaseIDL.MUnionFieldDef; import ccmtools.parser.idl.ScopedName; import ccmtools.parser.idl.enumeration.EnumTest; import ccmtools.parser.idl.primitive.PrimitiveTest; --- 7,14 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; import ccmtools.parser.idl.ScopedName; import ccmtools.parser.idl.enumeration.EnumTest; + import ccmtools.parser.idl.metamodel.BaseIDL.MUnionDef; + import ccmtools.parser.idl.metamodel.BaseIDL.MUnionFieldDef; import ccmtools.parser.idl.primitive.PrimitiveTest; |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 12:07:37
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/idl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4737/src/ccmtools/generator/idl Modified Files: CcmToIdlModelMapper.java Main.java Log Message: Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel. Index: Main.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/idl/Main.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Main.java 18 Jan 2007 17:11:51 -0000 1.10 --- Main.java 19 Jan 2007 12:07:30 -0000 1.11 *************** *** 17,22 **** import ccmtools.CodeGenerator.GraphTraverser; import ccmtools.generator.idl.metamodel.ModelRepository; - import ccmtools.metamodel.BaseIDL.MContainer; import ccmtools.parser.idl.ParserManager; import ccmtools.ui.UserInterfaceDriver; import ccmtools.utils.ConfigurationLocator; --- 17,22 ---- import ccmtools.CodeGenerator.GraphTraverser; import ccmtools.generator.idl.metamodel.ModelRepository; import ccmtools.parser.idl.ParserManager; + import ccmtools.parser.idl.metamodel.BaseIDL.MContainer; import ccmtools.ui.UserInterfaceDriver; import ccmtools.utils.ConfigurationLocator; Index: CcmToIdlModelMapper.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/idl/CcmToIdlModelMapper.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** CcmToIdlModelMapper.java 18 Dec 2006 21:34:19 -0000 1.16 --- CcmToIdlModelMapper.java 19 Jan 2007 12:07:30 -0000 1.17 *************** *** 47,79 **** import ccmtools.generator.idl.metamodel.WCharType; import ccmtools.generator.idl.metamodel.WStringType; ! import ccmtools.metamodel.CcmModelHelper; ! 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.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.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; public class CcmToIdlModelMapper --- 47,79 ---- import ccmtools.generator.idl.metamodel.WCharType; import ccmtools.generator.idl.metamodel.WStringType; ! import ccmtools.parser.idl.metamodel.CcmModelHelper; ! 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.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.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; public class CcmToIdlModelMapper |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 12:07:37
|
Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/notsupported In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4737/src-test/ccmtools/parser/idl/notsupported Modified Files: NotSupportedTest.java Log Message: Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel. Index: NotSupportedTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/notsupported/NotSupportedTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NotSupportedTest.java 18 Jan 2007 17:11:52 -0000 1.2 --- NotSupportedTest.java 19 Jan 2007 12:07:31 -0000 1.3 *************** *** 8,13 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; - import ccmtools.metamodel.BaseIDL.MContainer; import ccmtools.parser.idl.ParserManager; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; --- 8,13 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; import ccmtools.parser.idl.ParserManager; + import ccmtools.parser.idl.metamodel.BaseIDL.MContainer; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 12:07:37
|
Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/forward In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4737/src-test/ccmtools/parser/idl/forward Modified Files: StructForwardDeclarationTest.java UnionForwardDeclarationTest.java Log Message: Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel. Index: StructForwardDeclarationTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/forward/StructForwardDeclarationTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StructForwardDeclarationTest.java 8 Nov 2006 10:31:51 -0000 1.1 --- StructForwardDeclarationTest.java 19 Jan 2007 12:07:29 -0000 1.2 *************** *** 6,11 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MFieldDef; ! import ccmtools.metamodel.BaseIDL.MStructDef; import ccmtools.parser.idl.struct.StructTest; --- 6,11 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MFieldDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MStructDef; import ccmtools.parser.idl.struct.StructTest; Index: UnionForwardDeclarationTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/forward/UnionForwardDeclarationTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** UnionForwardDeclarationTest.java 8 Nov 2006 10:31:51 -0000 1.1 --- UnionForwardDeclarationTest.java 19 Jan 2007 12:07:29 -0000 1.2 *************** *** 6,11 **** import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.metamodel.BaseIDL.MFieldDef; ! import ccmtools.metamodel.BaseIDL.MStructDef; import ccmtools.parser.idl.struct.StructTest; import ccmtools.parser.idl.union.UnionTest; --- 6,11 ---- import junit.framework.TestSuite; import ccmtools.CcmtoolsException; ! import ccmtools.parser.idl.metamodel.BaseIDL.MFieldDef; ! import ccmtools.parser.idl.metamodel.BaseIDL.MStructDef; import ccmtools.parser.idl.struct.StructTest; import ccmtools.parser.idl.union.UnionTest; |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 12:07:37
|
Update of /cvsroot/ccmtools/ccmtools/doc/DevelopmentNotes/JetTemplates In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4737/doc/DevelopmentNotes/JetTemplates Removed Files: JetTemplatesHowTo.txt Log Message: Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel. --- JetTemplatesHowTo.txt DELETED --- |
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/metamodel In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4737/src/ccmtools/metamodel Removed Files: CcmModelValidator.java CommandLineParameters.java Main.java .cvsignore CcmModelHelper.java CcmModelPrinter.java Log Message: Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel. --- .cvsignore DELETED --- --- CcmModelHelper.java DELETED --- --- CcmModelPrinter.java DELETED --- --- Main.java DELETED --- --- CcmModelValidator.java DELETED --- --- CommandLineParameters.java DELETED --- |
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/metamodel/ComponentIDL In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4737/src/ccmtools/metamodel/ComponentIDL Removed Files: MProvidesDefImpl.java MProvidesDef.java MEmitsDefImpl.java .cvsignore MFinderDef.java MComponentDef.java MHomeDef.java MFinderDefImpl.java MPublishesDefImpl.java MConsumesDefImpl.java MEventPortDefImpl.java MSupportsDefImpl.java MPublishesDef.java MHomeDefImpl.java MConsumesDef.java MEventDef.java MFactoryDefImpl.java MUsesDefImpl.java MFactoryDef.java MEventDefImpl.java MEmitsDef.java MEventPortDef.java MUsesDef.java MSupportsDef.java MComponentDefImpl.java Log Message: Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel. --- MFinderDefImpl.java DELETED --- --- MPublishesDef.java DELETED --- --- MEventPortDefImpl.java DELETED --- --- MSupportsDef.java DELETED --- --- MFactoryDefImpl.java DELETED --- --- MConsumesDef.java DELETED --- --- MEventDefImpl.java DELETED --- --- MComponentDef.java DELETED --- --- MHomeDef.java DELETED --- --- MFinderDef.java DELETED --- --- MEventPortDef.java DELETED --- --- MProvidesDef.java DELETED --- --- .cvsignore DELETED --- --- MHomeDefImpl.java DELETED --- --- MComponentDefImpl.java DELETED --- --- MProvidesDefImpl.java DELETED --- --- MFactoryDef.java DELETED --- --- MConsumesDefImpl.java DELETED --- --- MSupportsDefImpl.java DELETED --- --- MUsesDefImpl.java DELETED --- --- MEventDef.java DELETED --- --- MEmitsDefImpl.java DELETED --- --- MEmitsDef.java DELETED --- --- MPublishesDefImpl.java DELETED --- --- MUsesDef.java DELETED --- |
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/metamodel/BaseIDL In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4737/src/ccmtools/metamodel/BaseIDL Removed Files: MParameterDef.java MIDLTypeImpl.java MContainer.java MFieldDefImpl.java MValueDefImpl.java MArrayDefImpl.java MAttributeDef.java MConstantDef.java MWstringDefImpl.java MExceptionDef.java MSequenceDef.java MStructDefImpl.java MEnumDefImpl.java MValueBoxDefImpl.java MFieldDef.java MUnionFieldDef.java MValueMemberDef.java MContainerImpl.java MInterfaceDef.java MExceptionDefImpl.java MValueDef.java MAttributeDefImpl.java MArrayDef.java MInterfaceDefImpl.java MTypedImpl.java MContained.java MSequenceDefImpl.java MPrimitiveKind.java MWstringDef.java MNativeDefImpl.java MFixedDef.java BaseIdl.java MModuleDefImpl.java MStringDef.java MUnionDef.java MNativeDef.java MEnumDef.java MTypedefDefImpl.java MContainedImpl.java MConstantDefImpl.java MFixedDefImpl.java MParameterDefImpl.java MTypedefDef.java MPrimitiveDef.java MPrimitiveDefImpl.java MUnionFieldDefImpl.java MLong.java .cvsignore MStructDef.java MTyped.java MAliasDefImpl.java MIDLType.java MParameterMode.java MValueBoxDef.java MDefinitionKind.java MValueMemberDefImpl.java MStringDefImpl.java MAliasDef.java MOperationDefImpl.java MUnionDefImpl.java MModuleDef.java MOperationDef.java Log Message: Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel. --- MAttributeDef.java DELETED --- --- MValueDef.java DELETED --- --- MValueMemberDefImpl.java DELETED --- --- MFixedDef.java DELETED --- --- MOperationDef.java DELETED --- --- MAliasDef.java DELETED --- --- MExceptionDef.java DELETED --- --- MTypedefDefImpl.java DELETED --- --- MContained.java DELETED --- --- MParameterDef.java DELETED --- --- MNativeDefImpl.java DELETED --- --- MValueBoxDef.java DELETED --- --- MUnionFieldDef.java DELETED --- --- MUnionDef.java DELETED --- --- MWstringDef.java DELETED --- --- MFieldDef.java DELETED --- --- MExceptionDefImpl.java DELETED --- --- MArrayDef.java DELETED --- --- MConstantDef.java DELETED --- --- MUnionFieldDefImpl.java DELETED --- --- MContainer.java DELETED --- --- MModuleDefImpl.java DELETED --- --- MContainedImpl.java DELETED --- --- MPrimitiveDefImpl.java DELETED --- --- MIDLType.java DELETED --- --- MStructDefImpl.java DELETED --- --- MOperationDefImpl.java DELETED --- --- MDefinitionKind.java DELETED --- --- MPrimitiveDef.java DELETED --- --- .cvsignore DELETED --- --- MFieldDefImpl.java DELETED --- --- MInterfaceDef.java DELETED --- --- MConstantDefImpl.java DELETED --- --- MValueDefImpl.java DELETED --- --- MTypedImpl.java DELETED --- --- MTypedefDef.java DELETED --- --- MStructDef.java DELETED --- --- MParameterMode.java DELETED --- --- MTyped.java DELETED --- --- MModuleDef.java DELETED --- --- MFixedDefImpl.java DELETED --- --- MAliasDefImpl.java DELETED --- --- MIDLTypeImpl.java DELETED --- --- MEnumDefImpl.java DELETED --- --- MUnionDefImpl.java DELETED --- --- MWstringDefImpl.java DELETED --- --- MStringDefImpl.java DELETED --- --- MValueMemberDef.java DELETED --- --- MContainerImpl.java DELETED --- --- MEnumDef.java DELETED --- --- MAttributeDefImpl.java DELETED --- --- BaseIdl.java DELETED --- --- MParameterDefImpl.java DELETED --- --- MArrayDefImpl.java DELETED --- --- MSequenceDef.java DELETED --- --- MPrimitiveKind.java DELETED --- --- MSequenceDefImpl.java DELETED --- --- MStringDef.java DELETED --- --- MValueBoxDefImpl.java DELETED --- --- MInterfaceDefImpl.java DELETED --- --- MNativeDef.java DELETED --- --- MLong.java DELETED --- |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 12:05:47
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl/metamodel/BaseIDL In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4703/src/ccmtools/parser/idl/metamodel/BaseIDL Log Message: Directory /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl/metamodel/BaseIDL added to the repository |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 12:05:46
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl/metamodel In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4703/src/ccmtools/parser/idl/metamodel Log Message: Directory /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl/metamodel added to the repository |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 12:05:46
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl/metamodel/ComponentIDL In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4703/src/ccmtools/parser/idl/metamodel/ComponentIDL Log Message: Directory /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl/metamodel/ComponentIDL added to the repository |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 11:58:16
|
Update of /cvsroot/ccmtools/cpp-environment In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1313 Modified Files: ChangeLog Log Message: Added utils package for the case that wx-utils are not installed. Index: ChangeLog =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ChangeLog,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ChangeLog 8 Jan 2007 10:16:31 -0000 1.10 --- ChangeLog 19 Jan 2007 11:58:12 -0000 1.11 *************** *** 2,5 **** --- 2,12 ---- ============================================================================ + RELEASE-0.8.5 (January , 2007) + ---------------------------------------------------------------------------- + o) Added the externals and utils package which are used as a substitute for + the wx-toolsbox and wx-utils packages which are distributed with Confix. + + + RELEASE-0.8.2 (January 8, 2007) RELEASE-0.8.1 (December 21, 2006) |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 11:58:16
|
Update of /cvsroot/ccmtools/cpp-environment/utils/smartptr In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1313/utils/smartptr Added Files: linkassert.h smartptr.h Confix2.dir smartptr.cc Log Message: Added utils package for the case that wx-utils are not installed. --- NEW FILE: linkassert.h --- // -*- mode: C++; c-basic-offset: 3 -*- // // $Id$ // #ifndef wx_utils_code_linkassert_h #define wx_utils_code_linkassert_h namespace wamas { namespace platform { namespace utils { /** \page page_utils_code_linkassert Link Time Assertions \see LTA_MEMDECL \see LTA_MEMDEF \see LTA_STATDEF \section utils_code_linkassert What is that? Best to explain the problem in C first because it is more explicit there. Suppose you have a header file containing the following declaration, plus a "member" function: \code struct foo { long l1; long l2; }; extern void foo_print_l2(const struct foo*); \endcode In the implementation (the .c file), suppose you define <tt>foo_print_l2()</tt> as follows: \code void foo_print_l2(const struct foo* f) { printf ("%ld\n", f->l2) ; } \endcode Now, you change the declaration of <tt>struct foo</tt> to read \code struct foo { long l1; long l1_5; long l2; }; \endcode (note the move of \c l2 by 1 long in the memory layout) and you do \em not recompile your .c file to tell the function <tt>foo_print_l2()</tt> to use the new offset of \c l2 from the base pointer, the function will print <tt>foo->l1_5</tt> instead of <tt>foo->l2</tt>, if it is linked with a fresh executable. (This whole thing applies to classes as well (which are structs basically)). A general precaution to this is to reference a variable from the .h file that is defined in the .c file. In C, before the change, this would read in the header file \code struct foo { long l1; long l2; }; extern int foo_version1; // you have to explicitly reference the foo_version1 so that the // compiler does not ignore the declaration and thus does not // reference it static int foo_version = foo_version1; \endcode and in the .c file \code int foo_version1; \endcode If you change the memory layout of the struct, you somehow have to force a recompile of the .c file. Do this through a change of the name of the extern variable. In the .h file write \code struct foo { long l1; long l1_5; long l2; }; extern int foo_version2; static int foo_version = foo_version2; \endcode In the .c file write \code int foo_version2; \endcode Thus, if you make the .h file publicly available, and an executable compiled with this new <tt>struct foo</tt> memory layout references the <tt>foo_print_l2()</tt> function, it must also reference the <tt>foo_version2</tt> extern variable. If the executable is linked with the old .o file, the linker won't be able to resolve the reference because the old .o file still contains the old variable <tt>foo_version1</tt>. We call this (most sophisticatedly) a <em>link time assertion</em>. In C++, this could be written as follows using static members. No matter how you view it, in C or C++, the principle is the same. The .h file: \code class Foo { public: // something ... public: static const char* version1; } ; static const char* Foo_version = Foo::version1; \endcode The .cc file: \code // we use a char* for the variable (formatted like this) because // this enables us to grep a binary for a particular class // version/revision const char* Foo::version1 = "Foo"; \endcode \section utils_code_linkassert_when When to increment the version number To summarize, the rules of thumb as to when to change the <em>link time assertion symbol</em> (e.g. increment <tt>version1</tt> to <tt>version2</tt> in the example) are: <ul> <li>You added and/or removed a member variable</li> <li>You added and/or removed a virtual method (this changes the layout of the vtable (or so))</li> <li>You added and/or removed a base class (a base class can be thought of as an implicit member)</li> <li>You added and/or removed the <tt>virtual</tt> keyword to/from a base class</li> <li>You need not increment the version if you added/removed a non-virtual method.</li> </ul> */ /** \def LTA_MEMDECL(num) \ingroup utils_code \brief Declare class member with version number \a num. You write this macro in the class definition, about where you would declare the member (in fact, the macro declares the member for you). See \ref page_utils_code_linkassert for a description. */ #define LTA_MEMDECL(num) static const char* version##num /** \def LTA_MEMDEF(class, num, rhs) \ingroup utils_code \brief Implement member of \a class with version number \a and the value \a rhs. \a rhs is a string. You write this macro in the .cc file, just where you would implement the static member you declared with LTA_MEMDECL. See \ref page_utils_code_linkassert for a description. */ #define LTA_MEMDEF(class, num, rhs) const char* class::version##num = rhs /** \def LTA_STATDEF(class, num) \ingroup utils_code \brief Reference the static member. Referencing the static member is necessary. It persuades the compiler to generate a reference to the member, and to not optimize it away. See \ref page_utils_code_linkassert for a description. */ #ifdef __PXWC__ #define LTA_STATDEF(class, num) #else #define LTA_STATDEF(class, num) static const char* class##_##version##num = class::version##num #endif } // /namespace } // /namespace } // /namespace #endif --- NEW FILE: smartptr.h --- #ifndef wx_utils_code_smartptr_h #define wx_utils_code_smartptr_h #include "atomic_count.h" #include "linkassert.h" #include <iostream> #ifdef WX_REFCOUNTED_COLLECT_NEW #include <map> #endif namespace wamas { namespace platform { namespace utils { /** \brief Base class for all classes which are supposed to be pointed to by a smart pointer. Actually doesn't do anything, but rather provides the interface. \ingroup utils_code \author Joerg Faschingbauer \b COPYING \b A \b REFERENCE \b COUNTED \b THING Copying a refcounted thing is not straightforward yet it is simple. In an ideal world you would pass a class object either by copy or by using a smart pointer. The former method does not care about anything, it just copies, whereas the latter method maintains a reference count inside the object that is being passed. Everything is fine if you don't intermix both methods (which you shouldn't unless there is need to AND you know what you're doing). It gets more complicated if, for example, \b COPY \b CONSTRUCTOR we take a copy of a smartpointed object and pass that copy around using a smart pointer: we get a smart pointer xp that points to some object, say *x. \code SmartPtr<X> xp = get_object(); \endcode Now assume that *x, after execution of that statement, has a refcount of 2 (x->refcount()==2). In other words, another smart pointer (other than xp) points to it somewhere outside our scope. We now copy that object *x (not the smart pointer xp) into another object, *y. \code X* y = new X(*xp.ptr()); \endcode The question is: what reference count must *y now have? Obviously, since the reference count reflects the number of smart pointers pointing at it (well, ideally; one can always dirtily ref() and unref() by hand), the reference count of *y must be ZERO. Otherwise, if we would pass *y around using smart pointers (which would then be responsible for cleanup), we would leak memory. \code XPtr yp = XPtr(y); pass_around(yp); // leak \endcode \b ASSIGNMENT \b OPERATOR Now for the assignment operator. Suppose we get an object *x which is pointed to by, say, 2 smart pointers (x->refcount()==2), one of them being xp. \code SmartPtr<X> xp = get_object(); \endcode Now, eagerly crying for subtle bugs, we want to replace the content of *x with that of some other object newx of class X. \code X newx(...); *xp.ptr() = newx; \endcode The question is: what must be the reference count of *x? Obviously, since the number of smart pointers pointing at it does not change, the reference count must not change, it must still be 2 as before the assignment. */ class RefCounted { public: RefCounted() : refcount_(0) {} virtual ~RefCounted() {} /** @name see the big note above for copy semantics */ //@{ RefCounted(const RefCounted&) : refcount_(0) {} RefCounted& operator=(const RefCounted&) { return *this; } //@} /// increment reference count virtual void ref(); /// decrement reference count virtual void unref(); /// return the reference count long refcount() const { return refcount_; } /** @name simple wrappers to accommodate null pointers */ //@{ static void ref(RefCounted* r) { if (r) r->ref(); } static void unref(RefCounted* r) { if (r) r->unref(); } //@} #ifdef WX_REFCOUNTED_COLLECT_NEW void* operator new (std::size_t); void operator delete (void*); typedef std::map<std::size_t, long> NewStatistics; static NewStatistics new_statistics_; #endif private: atomic_count refcount_; public: LTA_MEMDECL(20061107); }; LTA_STATDEF(RefCounted, 20061107); /** \class SmartPtr \ingroup utils_code \brief Template class which manages pointers to RefCounted objects. \author Joerg Faschingbauer Smart pointers are supposed to be used in cases where you do not want to care about memory ownerships. For example, when you pass a pointer to an object to a function, you and the function have to agree upon who is responsible for deleting the object. You use a smart pointer to automatically accomplish that. You wrap a smart pointer around the raw pointer, and pass the smart pointer instead (of course, the function must be prepared to expect a smart pointer). If you are not interested in the object after the call, you simply let the smart pointer go out of scope. The smart pointer's destructor will then decrement the reference count of the pointed-to object, and, if the reference count has become zero, delete it. If you are interested in keeping the object, you store the smart pointer somewhere. This prevents the object's reference count from becoming zero. The function, on the other hand, may decide to store the smart pointer somewhere (and keep a reference on it), or to only temporarily use it and then forget about it (let it go out of scope). */ template <class T> class SmartPtr { public: /** Default constructor. Initially a smart pointer points to nothing (i.e., has the value 0). */ SmartPtr(): ptr_(0) {} /** "Eating" constructor. The object the argument points to is now managed by the smart pointer object. Hence it must not be deleted explicitly afterwards. */ explicit SmartPtr(T* p): ptr_(p) { RefCounted::ref(ptr_); } /** Copy constructor, template version (to be able to assign derived pointees). Increments the reference count on the object by one. */ template<class RHS> SmartPtr(const SmartPtr<RHS>& p): ptr_(0) { operator=(p); } /** Copy constructor, non-template version. Increments the reference count on the object by one. Implementor's note: one would think that the emplate version of the copy ctor should be used by the compiler to generate the default copy ctor. But that's not how C++ is defined - if we do not define an explicit non-template copy ctor, we would get a real default copy ctor which only copies the pointer and does no refcounting. */ SmartPtr(const SmartPtr& p): ptr_(0) { operator=(p); } /** Destructor. Decrements the reference count by one. Deletes the object (better to say, the object deletes itself) if the reference count becomes zero. */ ~SmartPtr() { RefCounted::unref(ptr_); } /** Assignment operator, template version. Same semantics as template copy constructor. */ template<class RHS> SmartPtr& operator=( const SmartPtr<RHS>& p) { if (this->ptr() != p.ptr()) { RefCounted::ref(p.ptr()); RefCounted::unref(this->ptr()); ptr_ = p.ptr(); } return *this; } /** Assignment operator, non-template version. Same semantics as copy constructor. Implementor's note: we have to define a non-template version for the same reason why we have to define a non-template copy ctor. */ SmartPtr& operator=( const SmartPtr& p) { if (this->ptr() != p.ptr()) { RefCounted::ref(p.ptr()); RefCounted::unref(this->ptr()); ptr_ = p.ptr(); } return *this; } /** Acquire responsibility for the object (and increment its reference count). An eventual existing responsibility for a different object is canceled, and that reference is decremented. */ template<class RHS> void eat(RHS* p) { if (p == ptr_) return; RefCounted::unref(ptr_); ptr_ = p; RefCounted::ref(p); } /** Become a NULL pointer. Unreference an object that we are pointing to. */ void forget() { if (ptr_) { RefCounted::unref(ptr_); ptr_ = NULL; } } /** \name Smart pointer comparison */ //@{ operator bool() const { // Doze bullshit yells "Performance warning" if I don't cast // explicitly return static_cast<bool>(ptr_); } bool operator !() const { return !ptr_; } bool operator< (const SmartPtr& that) const { return ptr_< that.ptr_; } bool operator==(const SmartPtr& that) const { return ptr_==that.ptr_; } bool operator> (const SmartPtr& that) const { return ptr_> that.ptr_; } bool operator<=(const SmartPtr& that) const { return ptr_<=that.ptr_; } bool operator>=(const SmartPtr& that) const { return ptr_>=that.ptr_; } //@} /** A pointer to the object, modifiable. */ T* ptr() const { return ptr_; } /** A pointer to the object, modifiable, trading off for readability. */ T* operator->() { return ptr_; } /** A pointer to the object, non-modifiable. */ const T* cptr() const { return ptr_; } /** A pointer to the object, non-modifiable, trading off for readability. */ const T* operator->() const { return ptr_; } private: T* ptr_; }; } // /namespace } // /namespace } // /namespace #endif --- NEW FILE: Confix2.dir --- --- NEW FILE: smartptr.cc --- #include "smartptr.h" namespace wamas { namespace platform { namespace utils { LTA_MEMDEF(RefCounted, 20061107, "$Id$"); void RefCounted::ref() { ++refcount_; } void RefCounted::unref() { if (!--refcount_) delete this; } #ifdef WX_REFCOUNTED_COLLECT_NEW RefCounted::NewStatistics RefCounted::new_statistics_; void* RefCounted::operator new (std::size_t s) { NewStatistics::iterator pos = new_statistics_.find(s); if(pos==new_statistics_.end()) new_statistics_[s] = 1; else ++(pos->second); return malloc(s); } void RefCounted::operator delete (void* p) { free(p); } #endif // WX_REFCOUNTED_COLLECT_NEW } // /namespace } // /namespace } // /namespace |
1 message has been excluded from this view by a project administrator.
