Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv26834/src/ccmtools/generator/java/metamodel
Modified Files:
UsesDef.java OperationDef.java
Log Message:
most of the generated 'import' statements have been removed
Index: UsesDef.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel/UsesDef.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** UsesDef.java 16 Jan 2007 09:25:22 -0000 1.15
--- UsesDef.java 20 Mar 2007 10:56:02 -0000 1.16
***************
*** 97,104 ****
if(isMultiple())
{
! return TAB + "private java.util.Map<Cookie, " + getInterface().generateAbsoluteJavaName()
+ "> " + getIdentifier()
+ "ReceptacleMap = " + NL + TAB2
! + " new java.util.HashMap<Cookie, " + getInterface().generateAbsoluteJavaName()
+ ">();";
}
--- 97,104 ----
if(isMultiple())
{
! return TAB + "private java.util.Map<Components.Cookie, " + getInterface().generateAbsoluteJavaName()
+ "> " + getIdentifier()
+ "ReceptacleMap = " + NL + TAB2
! + " new java.util.HashMap<Components.Cookie, " + getInterface().generateAbsoluteJavaName()
+ ">();";
}
***************
*** 120,124 ****
return TAB + getInterface().generateAbsoluteJavaName() +
" get_connection_" + getIdentifier() + "()\n" +
! TAB2 + "throws NoConnection;";
}
}
--- 120,124 ----
return TAB + getInterface().generateAbsoluteJavaName() +
" get_connection_" + getIdentifier() + "()\n" +
! TAB2 + "throws Components.NoConnection;";
}
}
***************
*** 175,182 ****
if(isMultiple())
{
! return TAB + "private Map<Cookie, "
+ getInterface().generateAbsoluteJavaName() + "> "
+ getIdentifier() + "ReceptacleMap = " + NL + TAB2
! + "new HashMap<Cookie, "
+ getInterface().generateAbsoluteJavaName() + ">();\n";
}
--- 175,182 ----
if(isMultiple())
{
! return TAB + "private java.util.Map<Components.Cookie, "
+ getInterface().generateAbsoluteJavaName() + "> "
+ getIdentifier() + "ReceptacleMap = " + NL + TAB2
! + "new java.util.HashMap<Components.Cookie, "
+ getInterface().generateAbsoluteJavaName() + ">();\n";
}
***************
*** 257,261 ****
if(isMultiple())
{
! return TAB + "private Map<ccmtools.corba.Components.Cookie, "
+ getInterface().generateAbsoluteIdlName() + "> "
+ getIdentifier() + "ReceptacleMap;\n";
--- 257,261 ----
if(isMultiple())
{
! return TAB + "private java.util.Map<ccmtools.corba.Components.Cookie, "
+ getInterface().generateAbsoluteIdlName() + "> "
+ getIdentifier() + "ReceptacleMap;\n";
***************
*** 273,277 ****
{
return TAB2 + getIdentifier()
! + "ReceptacleMap = new HashMap<ccmtools.corba.Components.Cookie, "
+ getInterface().generateAbsoluteIdlName() + ">();\n";
}
--- 273,277 ----
{
return TAB2 + getIdentifier()
! + "ReceptacleMap = new java.util.HashMap<ccmtools.corba.Components.Cookie, "
+ getInterface().generateAbsoluteIdlName() + ">();\n";
}
Index: OperationDef.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel/OperationDef.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** OperationDef.java 21 Feb 2007 16:07:26 -0000 1.16
--- OperationDef.java 20 Mar 2007 10:56:02 -0000 1.17
***************
*** 150,154 ****
{
StringBuilder code = new StringBuilder();
! code.append("throws CCMException");
if(getException().size() != 0)
{
--- 150,154 ----
{
StringBuilder code = new StringBuilder();
! code.append("throws Components.CCMException");
if(getException().size() != 0)
{
|
