Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10827/src/ccmtools/generator/java/metamodel
Modified Files:
ComponentDef.java
Log Message:
Java assemblies
Index: ComponentDef.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel/ComponentDef.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** ComponentDef.java 19 Feb 2007 09:39:22 -0000 1.23
--- ComponentDef.java 19 Feb 2007 12:26:54 -0000 1.24
***************
*** 28,31 ****
--- 28,32 ----
import ccmtools.parser.assembly.metamodel.Port;
import ccmtools.parser.idl.metamodel.CcmModelHelper;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MContained;
import ccmtools.parser.idl.metamodel.ComponentIDL.MComponentDef;
import ccmtools.parser.idl.metamodel.ComponentIDL.MHomeDef;
***************
*** 294,297 ****
--- 295,306 ----
String code = TAB + "private " + java_type + " " + key + "_;";
list.add(code);
+ for (ProvidesDef p : getFacet())
+ {
+ if (p.getIdentifier().equals(key))
+ {
+ throw new RuntimeException("element \"" + key
+ + "\": name conflict between IDL and assembly");
+ }
+ }
}
return list.iterator();
|
