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: Robert L. <rle...@us...> - 2007-03-20 14:59:39
|
Update of /cvsroot/ccmtools/java-environment/src/Components In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3744/src/Components Added Files: ComponentDelegator.java Log Message: component adapter now uses ComponentDelegator --- NEW FILE: ComponentDelegator.java --- /* * Created on Mar 20, 2007 * * R&D Salomon Automation (http://www.salomon.at) * * Robert Lechner (rob...@sa...) * * $Id: ComponentDelegator.java,v 1.1 2007/03/20 14:06:13 rlechner Exp $ */ package Components; /** * If the implementation class of the component implements this interface, the local component * adapter delegates to it. */ public interface ComponentDelegator { /** * provides a facet * * @param name name of the facet * @return facet adapter (or null if the facet is unknown) */ Object provide( String name ); /** * connect a facet into a receptacle * * @param name name of the receptacle * @param connection the facet * @return cookie for multiple receptacles; null for single receptacles */ Cookie connect( String name, Object connection ) throws InvalidName, InvalidConnection, AlreadyConnected, ExceededConnectionLimit; /** * disconnects from a receptacle * * @param name name of the receptacle * @param ck cookie for multiple receptacles; null for single receptacles */ void disconnect( String name, Cookie ck ) throws InvalidName, InvalidConnection, CookieRequired, NoConnection; } |
|
From: Robert L. <rle...@us...> - 2007-03-20 14:05:25
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3367/src/ccmtools/generator/java/templates Modified Files: UsesDefMultipleEquivalentMethodAdapterLocalTemplate.java UsesDefEquivalentMethodAdapterLocalTemplate.java ProvidesDefEquivalentMethodAdapterLocalTemplate.java Log Message: component adapter now uses ComponentDelegator Index: UsesDefMultipleEquivalentMethodAdapterLocalTemplate.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/UsesDefMultipleEquivalentMethodAdapterLocalTemplate.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** UsesDefMultipleEquivalentMethodAdapterLocalTemplate.java 20 Mar 2007 10:56:01 -0000 1.5 --- UsesDefMultipleEquivalentMethodAdapterLocalTemplate.java 20 Mar 2007 14:05:21 -0000 1.6 *************** *** 17,36 **** protected final String TEXT_1 = NL + " public Components.Cookie connect_"; protected final String TEXT_2 = "("; ! protected final String TEXT_3 = " obj)" + NL + " throws Components.ExceededConnectionLimit, " + NL + " Components.InvalidConnection" + NL + " {" + NL + " logger.fine(\"Object reference = \" + obj);" + NL + " if(obj == null)" + NL + " {" + NL + " throw new Components.InvalidConnection();" + NL + " }\t" + NL + " else" + NL + " {" + NL + " Components.Cookie ck = new Components.CookieImpl(); "; ! protected final String TEXT_4 = NL + " "; ! protected final String TEXT_5 = "ReceptacleMap.put(ck, obj);" + NL + " return ck;" + NL + " }" + NL + " }" + NL + "" + NL + " public "; ! protected final String TEXT_6 = " disconnect_"; ! protected final String TEXT_7 = "(Components.Cookie ck)" + NL + " throws Components.InvalidConnection" + NL + " {" + NL + "\t logger.fine(\"Cookie = \" + ck); " + NL + " if(ck == null || !"; ! protected final String TEXT_8 = "ReceptacleMap.containsKey(ck))" + NL + " {" + NL + " throw new Components.InvalidConnection();" + NL + " }" + NL + " else" + NL + " {"; ! protected final String TEXT_9 = NL + " "; ! protected final String TEXT_10 = " f = "; ! protected final String TEXT_11 = "ReceptacleMap.get(ck);"; ! protected final String TEXT_12 = NL + " "; ! protected final String TEXT_13 = "ReceptacleMap.remove(ck);" + NL + " return f;" + NL + " }" + NL + " }" + NL + " " + NL + " public java.util.Map<Components.Cookie, "; ! protected final String TEXT_14 = "> get_connections_"; ! protected final String TEXT_15 = "()" + NL + " {" + NL + " logger.fine(\"\");" + NL + " // return a copy of the receptacle map" + NL + " return new java.util.HashMap<Components.Cookie, "; ! protected final String TEXT_16 = ">("; ! protected final String TEXT_17 = "ReceptacleMap);" + NL + " }"; ! protected final String TEXT_18 = NL; public String generate(Object argument) --- 17,38 ---- protected final String TEXT_1 = NL + " public Components.Cookie connect_"; protected final String TEXT_2 = "("; ! protected final String TEXT_3 = " obj)" + NL + " throws Components.ExceededConnectionLimit, " + NL + " Components.InvalidConnection" + NL + " {" + NL + " logger.fine(\"Object reference = \" + obj);" + NL + " if(obj == null)" + NL + " {" + NL + " throw new Components.InvalidConnection();" + NL + " }" + NL + " Components.Cookie ck;" + NL + " if(delegator!=null)" + NL + " {" + NL + " \ttry" + NL + " \t{" + NL + " \t\tck = delegator.connect(\""; ! protected final String TEXT_4 = "\", obj);" + NL + " \t}" + NL + " \tcatch(Components.InvalidName e)" + NL + " \t{" + NL + " \t\tthrow new Components.InvalidConnection(e.getMessage());" + NL + " \t}" + NL + " \tcatch(Components.AlreadyConnected e)" + NL + " \t{" + NL + " \t\tthrow new Components.ExceededConnectionLimit(e.getMessage());" + NL + " \t}" + NL + " }" + NL + " else" + NL + " {" + NL + " ck = new Components.CookieImpl(); " + NL + " }"; ! protected final String TEXT_5 = NL + " "; ! protected final String TEXT_6 = "ReceptacleMap.put(ck, obj);" + NL + " return ck;" + NL + " }" + NL + "" + NL + " public "; ! protected final String TEXT_7 = " disconnect_"; ! protected final String TEXT_8 = "(Components.Cookie ck)" + NL + " throws Components.InvalidConnection" + NL + " {" + NL + "\t logger.fine(\"Cookie = \" + ck); " + NL + " if(!"; ! protected final String TEXT_9 = "ReceptacleMap.containsKey(ck))" + NL + " {" + NL + " throw new Components.InvalidConnection();" + NL + " }" + NL + " if(delegator!=null)" + NL + " {" + NL + " \ttry" + NL + " \t{" + NL + " \t\tdelegator.disconnect(\""; ! protected final String TEXT_10 = "\", ck);" + NL + " \t}" + NL + " \tcatch(Components.InvalidName e)" + NL + " \t{" + NL + " \t\tthrow new Components.InvalidConnection(e.getMessage());" + NL + " \t}" + NL + " \tcatch(Components.CookieRequired e)" + NL + " \t{" + NL + " \t\tthrow new Components.InvalidConnection(e.getMessage());" + NL + " \t}" + NL + " \tcatch(Components.NoConnection e)" + NL + " \t{" + NL + " \t\tthrow new Components.InvalidConnection(e.getMessage());" + NL + " \t}" + NL + " }"; ! protected final String TEXT_11 = NL + " "; ! protected final String TEXT_12 = " f = "; ! protected final String TEXT_13 = "ReceptacleMap.get(ck);"; ! protected final String TEXT_14 = NL + " "; ! protected final String TEXT_15 = "ReceptacleMap.remove(ck);" + NL + " return f;" + NL + " }" + NL + " " + NL + " public java.util.Map<Components.Cookie, "; ! protected final String TEXT_16 = "> get_connections_"; ! protected final String TEXT_17 = "()" + NL + " {" + NL + " logger.fine(\"\");" + NL + " // return a copy of the receptacle map" + NL + " return new java.util.HashMap<Components.Cookie, "; ! protected final String TEXT_18 = ">("; ! protected final String TEXT_19 = "ReceptacleMap);" + NL + " }"; ! protected final String TEXT_20 = NL; public String generate(Object argument) *************** *** 46,67 **** stringBuffer.append(iface.generateAbsoluteJavaName()); stringBuffer.append(TEXT_3); - stringBuffer.append(TEXT_4); stringBuffer.append(uses.getIdentifier()); stringBuffer.append(TEXT_5); - stringBuffer.append(iface.generateAbsoluteJavaName()); - stringBuffer.append(TEXT_6); stringBuffer.append(uses.getIdentifier()); stringBuffer.append(TEXT_7); stringBuffer.append(uses.getIdentifier()); stringBuffer.append(TEXT_8); stringBuffer.append(TEXT_9); - stringBuffer.append(uses.getInterface().generateAbsoluteJavaName()); - stringBuffer.append(TEXT_10); stringBuffer.append(uses.getIdentifier()); stringBuffer.append(TEXT_11); stringBuffer.append(TEXT_12); stringBuffer.append(uses.getIdentifier()); stringBuffer.append(TEXT_13); - stringBuffer.append(iface.generateAbsoluteJavaName()); stringBuffer.append(TEXT_14); stringBuffer.append(uses.getIdentifier()); --- 48,69 ---- stringBuffer.append(iface.generateAbsoluteJavaName()); stringBuffer.append(TEXT_3); stringBuffer.append(uses.getIdentifier()); + stringBuffer.append(TEXT_4); stringBuffer.append(TEXT_5); stringBuffer.append(uses.getIdentifier()); + stringBuffer.append(TEXT_6); + stringBuffer.append(iface.generateAbsoluteJavaName()); stringBuffer.append(TEXT_7); stringBuffer.append(uses.getIdentifier()); stringBuffer.append(TEXT_8); + stringBuffer.append(uses.getIdentifier()); stringBuffer.append(TEXT_9); stringBuffer.append(uses.getIdentifier()); + stringBuffer.append(TEXT_10); stringBuffer.append(TEXT_11); + stringBuffer.append(uses.getInterface().generateAbsoluteJavaName()); stringBuffer.append(TEXT_12); stringBuffer.append(uses.getIdentifier()); stringBuffer.append(TEXT_13); stringBuffer.append(TEXT_14); stringBuffer.append(uses.getIdentifier()); *************** *** 71,75 **** --- 73,81 ---- stringBuffer.append(uses.getIdentifier()); stringBuffer.append(TEXT_17); + stringBuffer.append(iface.generateAbsoluteJavaName()); stringBuffer.append(TEXT_18); + stringBuffer.append(uses.getIdentifier()); + stringBuffer.append(TEXT_19); + stringBuffer.append(TEXT_20); return stringBuffer.toString(); } Index: UsesDefEquivalentMethodAdapterLocalTemplate.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/UsesDefEquivalentMethodAdapterLocalTemplate.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** UsesDefEquivalentMethodAdapterLocalTemplate.java 20 Mar 2007 10:56:00 -0000 1.5 --- UsesDefEquivalentMethodAdapterLocalTemplate.java 20 Mar 2007 14:05:21 -0000 1.6 *************** *** 17,36 **** protected final String TEXT_1 = NL + " public void connect_"; protected final String TEXT_2 = "("; ! protected final String TEXT_3 = " localObj)" + NL + " throws Components.AlreadyConnected, " + NL + " Components.InvalidConnection" + NL + " {" + NL + " logger.fine(\"obj = \" + localObj);" + NL + " if("; ! protected final String TEXT_4 = "Receptacle != null)" + NL + " {" + NL + " throw new Components.AlreadyConnected();" + NL + " }\t" + NL + " else" + NL + " {"; ! protected final String TEXT_5 = NL + " "; ! protected final String TEXT_6 = "Receptacle = localObj;" + NL + " }" + NL + " }" + NL + "" + NL + " public "; ! protected final String TEXT_7 = " disconnect_"; ! protected final String TEXT_8 = "()" + NL + " throws Components.NoConnection" + NL + " {" + NL + " logger.fine(\"\");" + NL + " if("; ! protected final String TEXT_9 = "Receptacle == null)" + NL + " {" + NL + " throw new Components.NoConnection();" + NL + " }" + NL + " else" + NL + " {"; ! protected final String TEXT_10 = NL + " "; ! protected final String TEXT_11 = " f = "; ! protected final String TEXT_12 = "Receptacle;"; ! protected final String TEXT_13 = NL + " "; ! protected final String TEXT_14 = "Receptacle = null;" + NL + " return f;" + NL + " }" + NL + " }" + NL + " " + NL + " public "; ! protected final String TEXT_15 = " get_connection_"; ! protected final String TEXT_16 = "()" + NL + " {" + NL + " logger.fine(\"\");" + NL + " return "; ! protected final String TEXT_17 = "Receptacle;" + NL + " }"; ! protected final String TEXT_18 = NL; public String generate(Object argument) --- 17,38 ---- protected final String TEXT_1 = NL + " public void connect_"; protected final String TEXT_2 = "("; ! protected final String TEXT_3 = " localObj)" + NL + " throws Components.AlreadyConnected, " + NL + " Components.InvalidConnection" + NL + " {" + NL + " logger.fine(\"obj = \" + localObj);" + NL + " if(delegator!=null)" + NL + " {" + NL + " \ttry" + NL + " \t{" + NL + " \t\tdelegator.connect(\""; ! protected final String TEXT_4 = "\", localObj);" + NL + " \t}" + NL + " \tcatch(Components.InvalidName e)" + NL + " \t{" + NL + " \t\tthrow new Components.InvalidConnection(e.getMessage());" + NL + " \t}" + NL + " \tcatch(Components.ExceededConnectionLimit e)" + NL + " \t{" + NL + " \t\tthrow new Components.AlreadyConnected(e.getMessage());" + NL + " \t}" + NL + " }" + NL + " else" + NL + " {" + NL + " if("; ! protected final String TEXT_5 = "Receptacle != null)" + NL + " {" + NL + " throw new Components.AlreadyConnected();" + NL + " }\t" + NL + " }"; ! protected final String TEXT_6 = NL + " "; ! protected final String TEXT_7 = "Receptacle = localObj;" + NL + " }" + NL + "" + NL + " public "; ! protected final String TEXT_8 = " disconnect_"; ! protected final String TEXT_9 = "()" + NL + " throws Components.NoConnection" + NL + " {" + NL + " logger.fine(\"\");" + NL + " if(delegator!=null)" + NL + " {" + NL + " \ttry" + NL + " \t{" + NL + " \t\tdelegator.disconnect(\""; ! protected final String TEXT_10 = "\", null);" + NL + " \t}" + NL + " \tcatch(Components.InvalidName e)" + NL + " \t{" + NL + " \t\tthrow new Components.NoConnection(e.getMessage());" + NL + " \t}" + NL + " \tcatch(Components.InvalidConnection e)" + NL + " \t{" + NL + " \t\tthrow new Components.NoConnection(e.getMessage());" + NL + " \t}" + NL + " \tcatch(Components.CookieRequired e)" + NL + " \t{" + NL + " \t\tthrow new Components.NoConnection(e.getMessage());" + NL + " \t}" + NL + " }" + NL + " else" + NL + " {" + NL + " if("; ! protected final String TEXT_11 = "Receptacle == null)" + NL + " {" + NL + " throw new Components.NoConnection();" + NL + " }" + NL + " }"; ! protected final String TEXT_12 = NL + " "; ! protected final String TEXT_13 = " f = "; ! protected final String TEXT_14 = "Receptacle;"; ! protected final String TEXT_15 = NL + " "; ! protected final String TEXT_16 = "Receptacle = null;" + NL + " return f;" + NL + " }" + NL + " " + NL + " public "; ! protected final String TEXT_17 = " get_connection_"; ! protected final String TEXT_18 = "()" + NL + " {" + NL + " logger.fine(\"\");" + NL + " return "; ! protected final String TEXT_19 = "Receptacle;" + NL + " }"; ! protected final String TEXT_20 = NL; public String generate(Object argument) *************** *** 45,72 **** stringBuffer.append(uses.getIdentifier()); stringBuffer.append(TEXT_4); - stringBuffer.append(TEXT_5); stringBuffer.append(uses.getIdentifier()); stringBuffer.append(TEXT_6); - stringBuffer.append(uses.getInterface().generateAbsoluteJavaName()); - stringBuffer.append(TEXT_7); stringBuffer.append(uses.getIdentifier()); stringBuffer.append(TEXT_8); stringBuffer.append(uses.getIdentifier()); stringBuffer.append(TEXT_9); stringBuffer.append(TEXT_10); - stringBuffer.append(uses.getInterface().generateAbsoluteJavaName()); - stringBuffer.append(TEXT_11); stringBuffer.append(uses.getIdentifier()); stringBuffer.append(TEXT_12); stringBuffer.append(TEXT_13); stringBuffer.append(uses.getIdentifier()); stringBuffer.append(TEXT_14); - stringBuffer.append(uses.getInterface().generateAbsoluteJavaName()); stringBuffer.append(TEXT_15); stringBuffer.append(uses.getIdentifier()); stringBuffer.append(TEXT_16); ! stringBuffer.append(uses.getIdentifier()); stringBuffer.append(TEXT_17); stringBuffer.append(TEXT_18); return stringBuffer.toString(); } --- 47,78 ---- stringBuffer.append(uses.getIdentifier()); stringBuffer.append(TEXT_4); stringBuffer.append(uses.getIdentifier()); + stringBuffer.append(TEXT_5); stringBuffer.append(TEXT_6); stringBuffer.append(uses.getIdentifier()); + stringBuffer.append(TEXT_7); + stringBuffer.append(uses.getInterface().generateAbsoluteJavaName()); stringBuffer.append(TEXT_8); stringBuffer.append(uses.getIdentifier()); stringBuffer.append(TEXT_9); + stringBuffer.append(uses.getIdentifier()); stringBuffer.append(TEXT_10); stringBuffer.append(uses.getIdentifier()); + stringBuffer.append(TEXT_11); stringBuffer.append(TEXT_12); + stringBuffer.append(uses.getInterface().generateAbsoluteJavaName()); stringBuffer.append(TEXT_13); stringBuffer.append(uses.getIdentifier()); stringBuffer.append(TEXT_14); stringBuffer.append(TEXT_15); stringBuffer.append(uses.getIdentifier()); stringBuffer.append(TEXT_16); ! stringBuffer.append(uses.getInterface().generateAbsoluteJavaName()); stringBuffer.append(TEXT_17); + stringBuffer.append(uses.getIdentifier()); stringBuffer.append(TEXT_18); + stringBuffer.append(uses.getIdentifier()); + stringBuffer.append(TEXT_19); + stringBuffer.append(TEXT_20); return stringBuffer.toString(); } Index: ProvidesDefEquivalentMethodAdapterLocalTemplate.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/ProvidesDefEquivalentMethodAdapterLocalTemplate.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ProvidesDefEquivalentMethodAdapterLocalTemplate.java 17 Jul 2006 07:28:08 -0000 1.3 --- ProvidesDefEquivalentMethodAdapterLocalTemplate.java 20 Mar 2007 14:05:21 -0000 1.4 *************** *** 18,28 **** protected final String TEXT_2 = " provide_"; protected final String TEXT_3 = "()" + NL + " {" + NL + " logger.fine(\"\");" + NL + " if("; ! protected final String TEXT_4 = "FacetAdapter == null)" + NL + " {"; ! protected final String TEXT_5 = NL + " "; ! protected final String TEXT_6 = "FacetAdapter = " + NL + " new "; ! protected final String TEXT_7 = "Adapter(localInterface.get_"; ! protected final String TEXT_8 = "());" + NL + " }" + NL + " return "; ! protected final String TEXT_9 = "FacetAdapter;" + NL + " }"; ! protected final String TEXT_10 = NL; public String generate(Object argument) --- 18,32 ---- protected final String TEXT_2 = " provide_"; protected final String TEXT_3 = "()" + NL + " {" + NL + " logger.fine(\"\");" + NL + " if("; ! protected final String TEXT_4 = "FacetAdapter == null)" + NL + " {" + NL + " \tif(delegator!=null)" + NL + " \t{" + NL + " \t\tObject o = delegator.provide(\""; ! protected final String TEXT_5 = "\");" + NL + " \t\tif(o!=null)" + NL + " \t\t{" + NL + " \t\t\t"; ! protected final String TEXT_6 = "FacetAdapter =" + NL + " \t\t\t\t("; ! protected final String TEXT_7 = ")o;" + NL + " \t\t\treturn "; ! protected final String TEXT_8 = "FacetAdapter;" + NL + " \t\t}" + NL + " \t}"; ! protected final String TEXT_9 = NL + " "; ! protected final String TEXT_10 = "FacetAdapter = " + NL + " new "; ! protected final String TEXT_11 = "Adapter(localInterface.get_"; ! protected final String TEXT_12 = "());" + NL + " }" + NL + " return "; ! protected final String TEXT_13 = "FacetAdapter;" + NL + " }"; ! protected final String TEXT_14 = NL; public String generate(Object argument) *************** *** 37,40 **** --- 41,45 ---- stringBuffer.append(provides.getIdentifier()); stringBuffer.append(TEXT_4); + stringBuffer.append(provides.getIdentifier()); stringBuffer.append(TEXT_5); stringBuffer.append(provides.getIdentifier()); *************** *** 44,50 **** stringBuffer.append(provides.getIdentifier()); stringBuffer.append(TEXT_8); - stringBuffer.append(provides.getIdentifier()); stringBuffer.append(TEXT_9); stringBuffer.append(TEXT_10); return stringBuffer.toString(); } --- 49,62 ---- stringBuffer.append(provides.getIdentifier()); stringBuffer.append(TEXT_8); stringBuffer.append(TEXT_9); + stringBuffer.append(provides.getIdentifier()); stringBuffer.append(TEXT_10); + stringBuffer.append(provides.getInterface().generateAbsoluteJavaName()); + stringBuffer.append(TEXT_11); + stringBuffer.append(provides.getIdentifier()); + stringBuffer.append(TEXT_12); + stringBuffer.append(provides.getIdentifier()); + stringBuffer.append(TEXT_13); + stringBuffer.append(TEXT_14); return stringBuffer.toString(); } |
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/jet In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3367/src/ccmtools/generator/java/templates/jet Modified Files: UsesDefMultipleEquivalentMethodAdapterLocal.jet ProvidesDefEquivalentMethodAdapterLocal.jet UsesDefEquivalentMethodAdapterLocal.jet Log Message: component adapter now uses ComponentDelegator Index: UsesDefMultipleEquivalentMethodAdapterLocal.jet =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/jet/UsesDefMultipleEquivalentMethodAdapterLocal.jet,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** UsesDefMultipleEquivalentMethodAdapterLocal.jet 20 Mar 2007 10:55:59 -0000 1.4 --- UsesDefMultipleEquivalentMethodAdapterLocal.jet 20 Mar 2007 14:05:21 -0000 1.5 *************** *** 16,26 **** { throw new Components.InvalidConnection(); ! } else { ! Components.Cookie ck = new Components.CookieImpl(); ! <%=uses.getIdentifier()%>ReceptacleMap.put(ck, obj); ! return ck; } } --- 16,42 ---- { throw new Components.InvalidConnection(); ! } ! Components.Cookie ck; ! if(delegator!=null) ! { ! try ! { ! ck = delegator.connect("<%=uses.getIdentifier()%>", obj); ! } ! catch(Components.InvalidName e) ! { ! throw new Components.InvalidConnection(e.getMessage()); ! } ! catch(Components.AlreadyConnected e) ! { ! throw new Components.ExceededConnectionLimit(e.getMessage()); ! } ! } else { ! ck = new Components.CookieImpl(); } + <%=uses.getIdentifier()%>ReceptacleMap.put(ck, obj); + return ck; } *************** *** 29,42 **** { logger.fine("Cookie = " + ck); ! if(ck == null || !<%=uses.getIdentifier()%>ReceptacleMap.containsKey(ck)) { throw new Components.InvalidConnection(); } ! else { ! <%=uses.getInterface().generateAbsoluteJavaName()%> f = <%=uses.getIdentifier()%>ReceptacleMap.get(ck); ! <%=uses.getIdentifier()%>ReceptacleMap.remove(ck); ! return f; } } --- 45,74 ---- { logger.fine("Cookie = " + ck); ! if(!<%=uses.getIdentifier()%>ReceptacleMap.containsKey(ck)) { throw new Components.InvalidConnection(); } ! if(delegator!=null) { ! try ! { ! delegator.disconnect("<%=uses.getIdentifier()%>", ck); ! } ! catch(Components.InvalidName e) ! { ! throw new Components.InvalidConnection(e.getMessage()); ! } ! catch(Components.CookieRequired e) ! { ! throw new Components.InvalidConnection(e.getMessage()); ! } ! catch(Components.NoConnection e) ! { ! throw new Components.InvalidConnection(e.getMessage()); ! } } + <%=uses.getInterface().generateAbsoluteJavaName()%> f = <%=uses.getIdentifier()%>ReceptacleMap.get(ck); + <%=uses.getIdentifier()%>ReceptacleMap.remove(ck); + return f; } Index: ProvidesDefEquivalentMethodAdapterLocal.jet =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/jet/ProvidesDefEquivalentMethodAdapterLocal.jet,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ProvidesDefEquivalentMethodAdapterLocal.jet 22 Feb 2006 13:38:14 -0000 1.2 --- ProvidesDefEquivalentMethodAdapterLocal.jet 20 Mar 2007 14:05:21 -0000 1.3 *************** *** 10,13 **** --- 10,23 ---- if(<%=provides.getIdentifier()%>FacetAdapter == null) { + if(delegator!=null) + { + Object o = delegator.provide("<%=provides.getIdentifier()%>"); + if(o!=null) + { + <%=provides.getIdentifier()%>FacetAdapter = + (<%=provides.getInterface().generateAbsoluteJavaName()%>)o; + return <%=provides.getIdentifier()%>FacetAdapter; + } + } <%=provides.getIdentifier()%>FacetAdapter = new <%=provides.getInterface().generateAbsoluteJavaName()%>Adapter(localInterface.get_<%=provides.getIdentifier()%>()); Index: UsesDefEquivalentMethodAdapterLocal.jet =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/jet/UsesDefEquivalentMethodAdapterLocal.jet,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** UsesDefEquivalentMethodAdapterLocal.jet 20 Mar 2007 10:55:59 -0000 1.4 --- UsesDefEquivalentMethodAdapterLocal.jet 20 Mar 2007 14:05:21 -0000 1.5 *************** *** 10,21 **** { logger.fine("obj = " + localObj); ! if(<%=uses.getIdentifier()%>Receptacle != null) { ! throw new Components.AlreadyConnected(); ! } else { ! <%=uses.getIdentifier()%>Receptacle = localObj; } } --- 10,36 ---- { logger.fine("obj = " + localObj); ! if(delegator!=null) { ! try ! { ! delegator.connect("<%=uses.getIdentifier()%>", localObj); ! } ! catch(Components.InvalidName e) ! { ! throw new Components.InvalidConnection(e.getMessage()); ! } ! catch(Components.ExceededConnectionLimit e) ! { ! throw new Components.AlreadyConnected(e.getMessage()); ! } ! } else { ! if(<%=uses.getIdentifier()%>Receptacle != null) ! { ! throw new Components.AlreadyConnected(); ! } } + <%=uses.getIdentifier()%>Receptacle = localObj; } *************** *** 24,37 **** { logger.fine(""); ! if(<%=uses.getIdentifier()%>Receptacle == null) { ! throw new Components.NoConnection(); } else { ! <%=uses.getInterface().generateAbsoluteJavaName()%> f = <%=uses.getIdentifier()%>Receptacle; ! <%=uses.getIdentifier()%>Receptacle = null; ! return f; } } --- 39,71 ---- { logger.fine(""); ! if(delegator!=null) { ! try ! { ! delegator.disconnect("<%=uses.getIdentifier()%>", null); ! } ! catch(Components.InvalidName e) ! { ! throw new Components.NoConnection(e.getMessage()); ! } ! catch(Components.InvalidConnection e) ! { ! throw new Components.NoConnection(e.getMessage()); ! } ! catch(Components.CookieRequired e) ! { ! throw new Components.NoConnection(e.getMessage()); ! } } else { ! if(<%=uses.getIdentifier()%>Receptacle == null) ! { ! throw new Components.NoConnection(); ! } } + <%=uses.getInterface().generateAbsoluteJavaName()%> f = <%=uses.getIdentifier()%>Receptacle; + <%=uses.getIdentifier()%>Receptacle = null; + return f; } |
|
From: Robert L. <rle...@us...> - 2007-03-20 11:21:14
|
Update of /cvsroot/ccmtools/ccmtools/test/JavaAssembly/sample_logger In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv28069/test/JavaAssembly/sample_logger Modified Files: Makefile Log Message: new target 'test' Index: Makefile =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/JavaAssembly/sample_logger/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 23 Feb 2007 10:49:29 -0000 1.2 --- Makefile 20 Mar 2007 10:58:32 -0000 1.3 *************** *** 10,11 **** --- 10,14 ---- clean: rm -rf gen + + test: clean all + rm -rf gen |
|
From: Robert L. <rle...@us...> - 2007-03-20 11:21:14
|
Update of /cvsroot/ccmtools/ccmtools/test/JavaAssembly/multiple_receptacles In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27756/test/JavaAssembly/multiple_receptacles Log Message: Directory /cvsroot/ccmtools/ccmtools/test/JavaAssembly/multiple_receptacles added to the repository |
|
From: Robert L. <rle...@us...> - 2007-03-20 11:21:14
|
Update of /cvsroot/ccmtools/ccmtools/test/JavaAssembly/multiple_receptacles In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv28028/test/JavaAssembly/multiple_receptacles Added Files: Makefile Outer.idl Inner.idl Outer.assembly Pusher.idl .cvsignore Log Message: assembly test for multiple receptacles --- NEW FILE: .cvsignore --- wamas --- NEW FILE: Outer.assembly --- module wamas { assembly implements Outer { component Inner inner; connect inner.input to this.input; connect this.out1 to inner.out1; connect this.out2 to inner.out2; }; }; --- NEW FILE: Pusher.idl --- module wamas { interface Pusher { void push(in string value); }; }; --- NEW FILE: Makefile --- all: ccmjava -app -iface -local *.idl ccmjava -assembly Outer.assembly *.idl javac `find -name '*.java'` rm `find -name '*.class'` doc: javadoc -d doc `find wamas -name '*.java'` clean: rm -rf wamas doc --- NEW FILE: Outer.idl --- #include "Pusher.idl" module wamas { component Outer { provides Pusher input; uses Pusher out1; uses multiple Pusher out2; }; home OuterHome manages Outer {}; }; --- NEW FILE: Inner.idl --- #include "Pusher.idl" module wamas { component Inner { provides Pusher input; uses Pusher out1; uses multiple Pusher out2; }; home InnerHome manages Inner {}; }; |
|
From: Robert L. <rle...@us...> - 2007-03-20 11:21:14
|
Update of /cvsroot/ccmtools/ccmtools/test/JavaAssembly/test1 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv28069/test/JavaAssembly/test1 Modified Files: Makefile Log Message: new target 'test' Index: Makefile =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/JavaAssembly/test1/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 27 Feb 2007 09:25:28 -0000 1.4 --- Makefile 20 Mar 2007 10:58:32 -0000 1.5 *************** *** 7,10 **** --- 7,16 ---- rm `find -name '*.class'` + doc: + javadoc -d doc `find wamas -name '*.java'` + clean: + rm -rf wamas doc + + test: clean all rm -rf wamas |
|
From: Robert L. <rle...@us...> - 2007-03-20 11:21:14
|
Update of /cvsroot/ccmtools/ccmtools/test/JavaAssembly/deploy_logger In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv28069/test/JavaAssembly/deploy_logger Modified Files: Makefile Log Message: new target 'test' Index: Makefile =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/JavaAssembly/deploy_logger/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 23 Feb 2007 13:15:11 -0000 1.1 --- Makefile 20 Mar 2007 10:58:32 -0000 1.2 *************** *** 10,11 **** --- 10,14 ---- clean: rm -rf gen + + test: clean all + rm -rf gen |
|
From: Robert L. <rle...@us...> - 2007-03-20 10:56:08
|
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) { |
|
From: Robert L. <rle...@us...> - 2007-03-20 08:59:36
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/jet In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29304/src/ccmtools/generator/java/templates/jet Modified Files: ComponentDefAdapterLocal.jet Log Message: no generated 'import' statements Index: ComponentDefAdapterLocal.jet =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/jet/ComponentDefAdapterLocal.jet,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ComponentDefAdapterLocal.jet 10 Jan 2007 16:19:14 -0000 1.14 --- ComponentDefAdapterLocal.jet 20 Mar 2007 08:11:51 -0000 1.15 *************** *** 12,32 **** package <%=component.generateJavaNamespace()%>; - import java.util.logging.Logger; - - import Components.AlreadyConnected; - import Components.Assembly; - import Components.CCMException; - import Components.CCMHome; - import Components.Cookie; - import Components.CookieImpl; - import Components.CookieRequired; - import Components.ExceededConnectionLimit; - import Components.InvalidConfiguration; - import Components.InvalidConnection; - import Components.InvalidName; - import Components.NoConnection; - import Components.RemoveFailure; - import ccmtools.local.ServiceLocator; - <%=component.generateJavaImportStatements()%> --- 12,15 ---- *************** *** 34,42 **** implements <%=component.getIdentifier()%> { ! private Logger logger = ServiceLocator.instance().getLogger(); private <%=component.generateCcmIdentifier()%> localInterface; private <%=component.generateCcmIdentifier()%>_Context ctx; ! private Assembly assembly; /** Facet adapter references */ --- 17,25 ---- implements <%=component.getIdentifier()%> { ! private java.util.logging.Logger logger = ccmtools.local.ServiceLocator.instance().getLogger(); private <%=component.generateCcmIdentifier()%> localInterface; private <%=component.generateCcmIdentifier()%>_Context ctx; ! private Components.Assembly assembly; /** Facet adapter references */ *************** *** 73,77 **** } ! public <%=component.getIdentifier()%>Adapter(<%=component.generateCcmIdentifier()%> localInterface, Assembly assembly) { logger.fine("localInterface = " + localInterface + ", " + assembly); --- 56,60 ---- } ! public <%=component.getIdentifier()%>Adapter(<%=component.generateCcmIdentifier()%> localInterface, Components.Assembly assembly) { logger.fine("localInterface = " + localInterface + ", " + assembly); *************** *** 157,161 **** public void configuration_complete() ! throws InvalidConfiguration { logger.fine(""); --- 140,144 ---- public void configuration_complete() ! throws Components.InvalidConfiguration { logger.fine(""); *************** *** 170,181 **** localInterface.ccm_activate(); } ! catch(CCMException e) { ! throw new InvalidConfiguration(); } } public void remove() ! throws RemoveFailure { logger.fine(""); --- 153,164 ---- localInterface.ccm_activate(); } ! catch(Components.CCMException e) { ! throw new Components.InvalidConfiguration(); } } public void remove() ! throws Components.RemoveFailure { logger.fine(""); *************** *** 189,199 **** } } ! catch(CCMException e) { ! throw new RemoveFailure(); } } ! public CCMHome get_ccm_home() { throw new RuntimeException("Not implemented!"); --- 172,182 ---- } } ! catch(Components.CCMException e) { ! throw new Components.RemoveFailure(); } } ! public Components.CCMHome get_ccm_home() { throw new RuntimeException("Not implemented!"); *************** *** 204,213 **** public Object provide_facet(String name) ! throws InvalidName { logger.fine("name = " + name); if(name == null) { ! throw new InvalidName(); } <% --- 187,196 ---- public Object provide_facet(String name) ! throws Components.InvalidName { logger.fine("name = " + name); if(name == null) { ! throw new Components.InvalidName(); } <% *************** *** 220,224 **** } %> ! throw new InvalidName(); } --- 203,207 ---- } %> ! throw new Components.InvalidName(); } *************** *** 226,241 **** /** Receptacle methods */ ! public Cookie connect(String name, Object obj) ! throws InvalidName, InvalidConnection, ! AlreadyConnected, ExceededConnectionLimit { logger.fine("name = " + name + ", obj = " + obj); if(name == null) { ! throw new InvalidName(); } if(obj == null) { ! throw new InvalidConnection(); } <% --- 209,224 ---- /** Receptacle methods */ ! public Components.Cookie connect(String name, Object obj) ! throws Components.InvalidName, Components.InvalidConnection, ! Components.AlreadyConnected, Components.ExceededConnectionLimit { logger.fine("name = " + name + ", obj = " + obj); if(name == null) { ! throw new Components.InvalidName(); } if(obj == null) { ! throw new Components.InvalidConnection(); } <% *************** *** 250,269 **** else { ! throw new InvalidName(); } } ! public void disconnect(String name, Cookie ck) ! throws InvalidName, InvalidConnection, ! CookieRequired, NoConnection { logger.fine("name = " + name + ", ck = " + ck ); if(name == null) { ! throw new InvalidName(); } if(ck == null) { ! throw new CookieRequired(); } <% --- 233,252 ---- else { ! throw new Components.InvalidName(); } } ! public void disconnect(String name, Components.Cookie ck) ! throws Components.InvalidName, Components.InvalidConnection, ! Components.CookieRequired, Components.NoConnection { logger.fine("name = " + name + ", ck = " + ck ); if(name == null) { ! throw new Components.InvalidName(); } if(ck == null) { ! throw new Components.CookieRequired(); } <% *************** *** 278,282 **** else { ! throw new InvalidName(); } } --- 261,265 ---- else { ! throw new Components.InvalidName(); } } |
|
From: Robert L. <rle...@us...> - 2007-03-20 08:11:56
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29304/src/ccmtools/generator/java/templates Modified Files: ComponentDefAdapterLocalTemplate.java Log Message: no generated 'import' statements Index: ComponentDefAdapterLocalTemplate.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/ComponentDefAdapterLocalTemplate.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ComponentDefAdapterLocalTemplate.java 10 Jan 2007 16:19:13 -0000 1.15 --- ComponentDefAdapterLocalTemplate.java 20 Mar 2007 08:11:50 -0000 1.16 *************** *** 18,28 **** protected final String TEXT_1 = "/*" + NL + " * This file was automatically generated by "; protected final String TEXT_2 = NL + " * <http://ccmtools.sourceforge.net>" + NL + " * DO NOT EDIT!" + NL + " */" + NL + "" + NL + "package "; ! protected final String TEXT_3 = ";" + NL + "" + NL + "import java.util.logging.Logger;" + NL + "" + NL + "import Components.AlreadyConnected;" + NL + "import Components.Assembly;" + NL + "import Components.CCMException; " + NL + "import Components.CCMHome;" + NL + "import Components.Cookie;" + NL + "import Components.CookieImpl;" + NL + "import Components.CookieRequired;" + NL + "import Components.ExceededConnectionLimit;" + NL + "import Components.InvalidConfiguration;" + NL + "import Components.InvalidConnection;" + NL + "import Components.InvalidName;" + NL + "import Components.NoConnection;" + NL + "import Components.RemoveFailure;" + NL + "import ccmtools.local.ServiceLocator;" + NL; protected final String TEXT_4 = NL; protected final String TEXT_5 = " " + NL + " " + NL + "public class "; protected final String TEXT_6 = "Adapter " + NL + " implements "; ! protected final String TEXT_7 = NL + "{" + NL + " private Logger logger = ServiceLocator.instance().getLogger();" + NL + " " + NL + " private "; protected final String TEXT_8 = " localInterface;" + NL + " private "; ! protected final String TEXT_9 = "_Context ctx;" + NL + " private Assembly assembly;" + NL + "" + NL + " /** Facet adapter references */"; protected final String TEXT_10 = NL; protected final String TEXT_11 = " " + NL + "\t" + NL + " /** Receptacle references */"; --- 18,28 ---- protected final String TEXT_1 = "/*" + NL + " * This file was automatically generated by "; protected final String TEXT_2 = NL + " * <http://ccmtools.sourceforge.net>" + NL + " * DO NOT EDIT!" + NL + " */" + NL + "" + NL + "package "; ! protected final String TEXT_3 = ";" + NL; protected final String TEXT_4 = NL; protected final String TEXT_5 = " " + NL + " " + NL + "public class "; protected final String TEXT_6 = "Adapter " + NL + " implements "; ! protected final String TEXT_7 = NL + "{" + NL + " private java.util.logging.Logger logger = ccmtools.local.ServiceLocator.instance().getLogger();" + NL + " " + NL + " private "; protected final String TEXT_8 = " localInterface;" + NL + " private "; ! protected final String TEXT_9 = "_Context ctx;" + NL + " private Components.Assembly assembly;" + NL + "" + NL + " /** Facet adapter references */"; protected final String TEXT_10 = NL; protected final String TEXT_11 = " " + NL + "\t" + NL + " /** Receptacle references */"; *************** *** 33,37 **** protected final String TEXT_16 = " localInterface)" + NL + " {" + NL + " this(localInterface, null);" + NL + " }" + NL + "\t" + NL + " public "; protected final String TEXT_17 = "Adapter("; ! protected final String TEXT_18 = " localInterface, Assembly assembly)" + NL + " {" + NL + " logger.fine(\"localInterface = \" + localInterface + \", \" + assembly);" + NL + " this.localInterface = localInterface;" + NL + " this.assembly = assembly;" + NL + " }" + NL + "\t" + NL + "\t" + NL + " /* " + NL + " * Supported interface methods " + NL + " */" + NL + "" + NL + " /** Supported interface attributes */"; protected final String TEXT_19 = NL; protected final String TEXT_20 = " " + NL + " " + NL + " " + NL + " /** Supported interface methods */"; --- 33,37 ---- protected final String TEXT_16 = " localInterface)" + NL + " {" + NL + " this(localInterface, null);" + NL + " }" + NL + "\t" + NL + " public "; protected final String TEXT_17 = "Adapter("; ! protected final String TEXT_18 = " localInterface, Components.Assembly assembly)" + NL + " {" + NL + " logger.fine(\"localInterface = \" + localInterface + \", \" + assembly);" + NL + " this.localInterface = localInterface;" + NL + " this.assembly = assembly;" + NL + " }" + NL + "\t" + NL + "\t" + NL + " /* " + NL + " * Supported interface methods " + NL + " */" + NL + "" + NL + " /** Supported interface attributes */"; protected final String TEXT_19 = NL; protected final String TEXT_20 = " " + NL + " " + NL + " " + NL + " /** Supported interface methods */"; *************** *** 43,56 **** protected final String TEXT_26 = " " + NL + " " + NL + " /** Receptacle equivalent methods */"; protected final String TEXT_27 = NL; ! protected final String TEXT_28 = NL + "\t" + NL + " /** CCMObject interface methods */" + NL + "\t" + NL + " public void configuration_complete()" + NL + " throws InvalidConfiguration" + NL + " {" + NL + " logger.fine(\"\");" + NL + " ctx = new "; ! protected final String TEXT_29 = "_ContextImpl(this); " + NL + " try" + NL + " {" + NL + " if(assembly != null) " + NL + " { " + NL + " assembly.configuration_complete(); " + NL + " }" + NL + " localInterface.set_session_context(ctx);" + NL + " localInterface.ccm_activate();" + NL + " }" + NL + " catch(CCMException e)" + NL + " {" + NL + " throw new InvalidConfiguration();" + NL + " }" + NL + " }" + NL + "" + NL + " public void remove()" + NL + " throws RemoveFailure" + NL + " { " + NL + " logger.fine(\"\");" + NL + " try " + NL + " {" + NL + " localInterface.ccm_remove();" + NL + " if(assembly != null) " + NL + " { " + NL + " assembly.tear_down(); " + NL + " assembly = null;" + NL + " }" + NL + " }" + NL + " catch(CCMException e)" + NL + " {" + NL + " throw new RemoveFailure();" + NL + " }" + NL + " }" + NL + " " + NL + " public CCMHome get_ccm_home()" + NL + " {" + NL + " throw new RuntimeException(\"Not implemented!\");" + NL + " }" + NL + " " + NL + " " + NL + " /** Navigation interface methods */" + NL + " " + NL + " public Object provide_facet(String name)" + NL + " throws InvalidName" + NL + " {" + NL + " logger.fine(\"name = \" + name);" + NL + " if(name == null)" + NL + " {" + NL + " throw new InvalidName();" + NL + " }"; protected final String TEXT_30 = NL; ! protected final String TEXT_31 = " " + NL + " throw new InvalidName();" + NL + " }" + NL + " " + NL + " " + NL + " /** Receptacle methods */" + NL + " " + NL + " public Cookie connect(String name, Object obj)" + NL + " throws InvalidName, InvalidConnection, " + NL + " AlreadyConnected, ExceededConnectionLimit" + NL + " {" + NL + " logger.fine(\"name = \" + name + \", obj = \" + obj);" + NL + " if(name == null)" + NL + " {" + NL + " throw new InvalidName();" + NL + " }" + NL + " if(obj == null)" + NL + " {" + NL + " throw new InvalidConnection();" + NL + " } "; protected final String TEXT_32 = " "; protected final String TEXT_33 = NL; ! protected final String TEXT_34 = " " + NL + " else" + NL + " {" + NL + " throw new InvalidName();" + NL + " }" + NL + " }" + NL + " " + NL + " public void disconnect(String name, Cookie ck)" + NL + " throws InvalidName, InvalidConnection, " + NL + " CookieRequired, NoConnection" + NL + " {" + NL + " logger.fine(\"name = \" + name + \", ck = \" + ck );" + NL + " if(name == null)" + NL + " {" + NL + " throw new InvalidName();" + NL + " }" + NL + " if(ck == null)" + NL + " {" + NL + " throw new CookieRequired();" + NL + " } "; protected final String TEXT_35 = " "; protected final String TEXT_36 = NL; ! protected final String TEXT_37 = " " + NL + " else" + NL + " {" + NL + " throw new InvalidName();" + NL + " }" + NL + " } " + NL + "}"; protected final String TEXT_38 = NL; --- 43,56 ---- protected final String TEXT_26 = " " + NL + " " + NL + " /** Receptacle equivalent methods */"; protected final String TEXT_27 = NL; ! protected final String TEXT_28 = NL + "\t" + NL + " /** CCMObject interface methods */" + NL + "\t" + NL + " public void configuration_complete()" + NL + " throws Components.InvalidConfiguration" + NL + " {" + NL + " logger.fine(\"\");" + NL + " ctx = new "; ! protected final String TEXT_29 = "_ContextImpl(this); " + NL + " try" + NL + " {" + NL + " if(assembly != null) " + NL + " { " + NL + " assembly.configuration_complete(); " + NL + " }" + NL + " localInterface.set_session_context(ctx);" + NL + " localInterface.ccm_activate();" + NL + " }" + NL + " catch(Components.CCMException e)" + NL + " {" + NL + " throw new Components.InvalidConfiguration();" + NL + " }" + NL + " }" + NL + "" + NL + " public void remove()" + NL + " throws Components.RemoveFailure" + NL + " { " + NL + " logger.fine(\"\");" + NL + " try " + NL + " {" + NL + " localInterface.ccm_remove();" + NL + " if(assembly != null) " + NL + " { " + NL + " assembly.tear_down(); " + NL + " assembly = null;" + NL + " }" + NL + " }" + NL + " catch(Components.CCMException e)" + NL + " {" + NL + " throw new Components.RemoveFailure();" + NL + " }" + NL + " }" + NL + " " + NL + " public Components.CCMHome get_ccm_home()" + NL + " {" + NL + " throw new RuntimeException(\"Not implemented!\");" + NL + " }" + NL + " " + NL + " " + NL + " /** Navigation interface methods */" + NL + " " + NL + " public Object provide_facet(String name)" + NL + " throws Components.InvalidName" + NL + " {" + NL + " logger.fine(\"name = \" + name);" + NL + " if(name == null)" + NL + " {" + NL + " throw new Components.InvalidName();" + NL + " }"; protected final String TEXT_30 = NL; ! protected final String TEXT_31 = " " + NL + " throw new Components.InvalidName();" + NL + " }" + NL + " " + NL + " " + NL + " /** Receptacle methods */" + NL + " " + NL + " public Components.Cookie connect(String name, Object obj)" + NL + " throws Components.InvalidName, Components.InvalidConnection, " + NL + " Components.AlreadyConnected, Components.ExceededConnectionLimit" + NL + " {" + NL + " logger.fine(\"name = \" + name + \", obj = \" + obj);" + NL + " if(name == null)" + NL + " {" + NL + " throw new Components.InvalidName();" + NL + " }" + NL + " if(obj == null)" + NL + " {" + NL + " throw new Components.InvalidConnection();" + NL + " } "; protected final String TEXT_32 = " "; protected final String TEXT_33 = NL; ! protected final String TEXT_34 = " " + NL + " else" + NL + " {" + NL + " throw new Components.InvalidName();" + NL + " }" + NL + " }" + NL + " " + NL + " public void disconnect(String name, Components.Cookie ck)" + NL + " throws Components.InvalidName, Components.InvalidConnection, " + NL + " Components.CookieRequired, Components.NoConnection" + NL + " {" + NL + " logger.fine(\"name = \" + name + \", ck = \" + ck );" + NL + " if(name == null)" + NL + " {" + NL + " throw new Components.InvalidName();" + NL + " }" + NL + " if(ck == null)" + NL + " {" + NL + " throw new Components.CookieRequired();" + NL + " } "; protected final String TEXT_35 = " "; protected final String TEXT_36 = NL; ! protected final String TEXT_37 = " " + NL + " else" + NL + " {" + NL + " throw new Components.InvalidName();" + NL + " }" + NL + " } " + NL + "}"; protected final String TEXT_38 = NL; |
|
From: Robert L. <rle...@us...> - 2007-03-19 08:32:42
|
Update of /cvsroot/ccmtools/ccmtools In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16831 Added Files: TODO Log Message: TODO list --- NEW FILE: TODO --- C++: no "using" or "using namespace"; always generate absolute names Java: no "import"; always generate absolute names Assemblies: "import" statement; no cmd. line paramter for IDL files Java: generate thread-safe local adapters; the component is the sync. object Java and C++: general concept for interface-proxies Java and C++: general concept for singletons C++: local adapter: try/catch to ensure the "throw" declaration; no "throw" declaration in impl. interface |
|
From: Robert L. <rle...@us...> - 2007-03-19 08:11:38
|
Update of /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv9053/src/templates/CppLocalTemplates Modified Files: MHomeDef Log Message: static method 'find_by_name' for each home adapter Index: MHomeDef =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MHomeDef,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** MHomeDef 17 Jan 2007 17:47:09 -0000 1.24 --- MHomeDef 19 Mar 2007 08:11:34 -0000 1.25 *************** *** 74,77 **** --- 74,81 ---- %(Identifier)s(::Components::AssemblyFactory::SmartPtr assembly_factory); virtual ~%(Identifier)s(); + + /// calling the home finder + static SmartPtr find_by_name(const std::string& name) + throw(::Components::HomeNotFound); %(MFactoryDefAdapterPrototypeV)s *************** *** 162,165 **** --- 166,186 ---- } + %(Identifier)s::SmartPtr %(Identifier)s::find_by_name(const std::string& name) + throw(::Components::HomeNotFound) + { + ::Components::HomeFinder* finder = ::Components::HomeFinder::Instance(); + assert(finder); + ::Components::CCMHome::SmartPtr sp = finder->find_home_by_name(name); + %(Identifier)s* hp = dynamic_cast< %(Identifier)s*>(sp.ptr()); + if(!hp) + { + std::string msg("home \""); + msg += name; + msg += "\" is not of type %(Identifier)s"; + throw ::Components::HomeNotFound(msg); + } + return SmartPtr(hp); + } + %(MFactoryDefAdapterDefinition)s |
|
From: Robert L. <rle...@us...> - 2007-03-19 08:04:20
|
Update of /cvsroot/ccmtools/cpp-environment/ccm/local/LocalComponents In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6457/ccm/local/LocalComponents Modified Files: HomeNotFound.cc ccmtools.h HomeFinder.cc Log Message: more informations if HomeFinder::find_home_by_name failes Index: ccmtools.h =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ccm/local/LocalComponents/ccmtools.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ccmtools.h 5 Mar 2007 09:25:47 -0000 1.2 --- ccmtools.h 19 Mar 2007 08:04:14 -0000 1.3 *************** *** 83,86 **** --- 83,87 ---- public: HomeNotFound() throw(); + HomeNotFound(const std::string& message) throw(); virtual ~HomeNotFound() throw(); }; Index: HomeFinder.cc =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ccm/local/LocalComponents/HomeFinder.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** HomeFinder.cc 5 Jan 2007 14:09:34 -0000 1.3 --- HomeFinder.cc 19 Mar 2007 08:04:14 -0000 1.4 *************** *** 37,41 **** if(it == HomePool.end()) { ! throw HomeNotFound(); } else --- 37,44 ---- if(it == HomePool.end()) { ! std::string msg("HomeNotFound: \""); ! msg += name; ! msg += "\""; ! throw HomeNotFound(msg); } else Index: HomeNotFound.cc =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ccm/local/LocalComponents/HomeNotFound.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** HomeNotFound.cc 5 Jan 2007 14:09:34 -0000 1.1 --- HomeNotFound.cc 19 Mar 2007 08:04:11 -0000 1.2 *************** *** 15,18 **** --- 15,24 ---- } + HomeNotFound::HomeNotFound(const std::string& message) + throw() + : Exception(message) + { + } + HomeNotFound::~HomeNotFound() throw() |
|
From: Robert L. <rle...@us...> - 2007-03-16 10:07:40
|
Update of /cvsroot/ccmtools/ccmtools/doc/manual In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25971/doc/manual Modified Files: CcmtoolsManual.pdf Log Message: bug fix in PDF doc.info Index: CcmtoolsManual.pdf =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/doc/manual/CcmtoolsManual.pdf,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** CcmtoolsManual.pdf 14 Feb 2007 12:32:19 -0000 1.17 --- CcmtoolsManual.pdf 16 Mar 2007 10:07:34 -0000 1.18 *************** *** 6823,6831 **** >> stream ! xÚíRk\Li Ö.jvr§ÞJºQ3Ó\4¹M53Â(#*B§Sq:gÎÔLjºX´¡á£Õvʺ¤V$åKÈÚl*Ðî)k÷·ù¸ûiû/ïÿÿ<ïó>çyÿÖÞK¦óeD"$pr:ÃÁîb 0 éµµ»IÀ=`á ðU!I ÏÙ Çd@ÖÀPhhH( lÝíúI\ÀC¨Æ&C0JC ! c` !ERãø$ý'"@Ìb0 AqÈ©ß' L |
|
From: Robert L. <rle...@us...> - 2007-03-16 09:51:57
|
Update of /cvsroot/ccmtools/ccmtools/doc/manual In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19833/doc/manual Modified Files: CcmtoolsManual.tex Log Message: bug fix in PDF doc.info Index: CcmtoolsManual.tex =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/doc/manual/CcmtoolsManual.tex,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CcmtoolsManual.tex 13 Feb 2007 10:16:11 -0000 1.7 --- CcmtoolsManual.tex 16 Mar 2007 09:51:48 -0000 1.8 *************** *** 7,21 **** \usepackage[latin1]{inputenc} \usepackage{listings} ! \usepackage{hyperref} ! \usepackage[pdftex]{graphicx} ! \DeclareGraphicsExtensions{.pdf,.png,.gif,.jpg} % PDF Document Info ! \hypersetup ! { ! pdftitle={CCM Tools Manual} ! pdfauthor={Egon Teiniker}, ! } ! \pdfcompresslevel=9 \setlength{\textwidth}{15 true cm} --- 7,30 ---- \usepackage[latin1]{inputenc} \usepackage{listings} ! % PDF Document Info ! \expandafter\ifx\csname pdfoutput\endcsname\relax ! \usepackage[draft]{hyperref} ! \usepackage{graphicx} ! \DeclareGraphicsExtensions{.eps,.fig} ! \else ! \usepackage{hyperref} ! \hypersetup{ ! pdfauthor={Egon Teiniker}, ! pdftitle={CCM Tools Manual}, ! pdfsubject={CORBA Component Model Tools}, ! pdfkeywords={CCM, CORBA, components} ! } ! \pdfcompresslevel=9 ! \usepackage[pdftex]{graphicx} ! \DeclareGraphicsExtensions{.pdf,.png,.gif,.jpg} ! \fi ! \setlength{\textwidth}{15 true cm} |
|
From: Robert L. <rle...@us...> - 2007-03-09 13:15:02
|
Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25591/test/CppGenerator Modified Files: Makefile Log Message: - Index: Makefile =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppGenerator/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 20 Dec 2005 15:13:11 -0000 1.3 --- Makefile 9 Mar 2007 13:14:57 -0000 1.4 *************** *** 1,26 **** ! all: attribute ! attribute: make -C attribute_types test ! supports: make -C supports_attribute test make -C supports_exception test make -C supports_inheritance test make -C supports_types test ! facet: make -C facet_attribute test make -C facet_exception test make -C facet_inheritance test make -C facet_module_exception test ! make -C facet_module_types test make -C facet_rename test make -C facet_types test make -C facet_constants test ! receptacle: make -C receptacle_attribute test make -C receptacle_exception test --- 1,39 ---- + all: clean-stamps stamp.attribute + clean-stamps: + rm -f stamp.* ! full: stamp.attribute\ ! stamp.supports\ ! stamp.facet\ ! stamp.receptacle\ ! stamp.home\ ! stamp.include\ ! stamp.module\ ! stamp.assembly ! stamp.attribute: make -C attribute_types test + touch stamp.attribute ! stamp.supports: make -C supports_attribute test make -C supports_exception test make -C supports_inheritance test make -C supports_types test + touch stamp.supports ! stamp.facet: make -C facet_attribute test make -C facet_exception test make -C facet_inheritance test make -C facet_module_exception test ! # make -C facet_module_types test make -C facet_rename test make -C facet_types test make -C facet_constants test + touch stamp.facet ! stamp.receptacle: make -C receptacle_attribute test make -C receptacle_exception test *************** *** 30,46 **** make -C receptacle_object test make -C receptacle_types test ! home: make -C home_exception test make -C home_types test ! include: make -C include_nested test ! module: ! make -C module_mixed test make -C module_nested test ! make -C module_reopen test ! assembly: make -C assembly_nested test --- 43,65 ---- make -C receptacle_object test make -C receptacle_types test + touch stamp.receptacle ! stamp.home: make -C home_exception test make -C home_types test + touch stamp.home ! stamp.include: make -C include_nested test + touch stamp.include ! stamp.module: ! # make -C module_mixed test make -C module_nested test ! # make -C module_reopen test ! touch stamp.module ! stamp.assembly: make -C assembly_nested test + touch stamp.assembly + |
|
From: Robert L. <rle...@us...> - 2007-03-09 09:07:16
|
Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv26912/test/CppGenerator Modified Files: .cvsignore Log Message: - Index: .cvsignore =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppGenerator/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** .cvsignore 13 Sep 2005 08:43:21 -0000 1.5 --- .cvsignore 9 Mar 2007 09:07:11 -0000 1.6 *************** *** 1,2 **** Makefile.in ! sandbox \ No newline at end of file --- 1,3 ---- Makefile.in ! sandbox ! stamp.* |
|
From: Robert L. <rle...@us...> - 2007-03-09 09:06:31
|
Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator/receptacle_inheritance/impl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv26550/test/CppGenerator/receptacle_inheritance/impl Modified Files: Test_impl.cc Log Message: bug fix: wrong use of local impl. interfaces Index: Test_impl.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppGenerator/receptacle_inheritance/impl/Test_impl.cc,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Test_impl.cc 5 Jan 2007 14:17:28 -0000 1.14 --- Test_impl.cc 9 Mar 2007 09:06:27 -0000 1.15 *************** *** 2,14 **** /*** * Test component business logic implementation. ! * ! * // TODO: WRITE YOUR DESCRIPTION HERE! * * @author ! * @version * * This file structure was automatically generated by CCM Tools * <http://ccmtools.sourceforge.net/> and contains a component's ! * implementation classes. ***/ --- 2,14 ---- /*** * Test component business logic implementation. ! * ! * // TODO: WRITE YOUR DESCRIPTION HERE! * * @author ! * @version * * This file structure was automatically generated by CCM Tools * <http://ccmtools.sourceforge.net/> and contains a component's ! * implementation classes. ***/ *************** *** 45,49 **** { ! CCM_InterfaceType::SmartPtr receptacle = ctx->get_connection_a_receptacle(); string str1 = "Hallo to first op()"; long size1 = receptacle->op1(str1); --- 45,49 ---- { ! InterfaceType::SmartPtr receptacle = ctx->get_connection_a_receptacle(); string str1 = "Hallo to first op()"; long size1 = receptacle->op1(str1); |
|
From: Robert L. <rle...@us...> - 2007-03-09 09:06:17
|
Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator/receptacle_multiple/impl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv26530/test/CppGenerator/receptacle_multiple/impl Modified Files: Test_impl.cc Log Message: bug fix: wrong use of local impl. interfaces Index: Test_impl.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppGenerator/receptacle_multiple/impl/Test_impl.cc,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Test_impl.cc 5 Jan 2007 14:17:27 -0000 1.14 --- Test_impl.cc 9 Mar 2007 09:06:14 -0000 1.15 *************** *** 1,13 **** /*** * Test component business logic implementation. ! * ! * // TODO: WRITE YOUR DESCRIPTION HERE! * * @author ! * @version * * This file structure was automatically generated by CCM Tools * <http://ccmtools.sourceforge.net/> and contains a component's ! * implementation classes. ***/ --- 1,13 ---- /*** * Test component business logic implementation. ! * ! * // TODO: WRITE YOUR DESCRIPTION HERE! * * @author ! * @version * * This file structure was automatically generated by CCM Tools * <http://ccmtools.sourceforge.net/> and contains a component's ! * implementation classes. ***/ *************** *** 44,52 **** cout << "=== Begin test case =======================================" << endl; ! consoleConnections multiCon = ctx->get_connections_console(); ! consoleConnections::const_iterator it; long size; ! ! for(it=multiCon.begin();it != multiCon.end(); ++it) { cout << " "; --- 44,52 ---- cout << "=== Begin test case =======================================" << endl; ! Test_console_Connections multiCon = ctx->get_connections_console(); ! Test_console_Connections::const_iterator it; long size; ! ! for(it=multiCon.begin();it != multiCon.end(); ++it) { cout << " "; |
|
From: Robert L. <rle...@us...> - 2007-03-09 09:05:34
|
Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator/module_reopen In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv26176/test/CppGenerator/module_reopen Added Files: .cvsignore Log Message: missing .cvsignore --- NEW FILE: .cvsignore --- xxx |
|
From: Robert L. <rle...@us...> - 2007-03-09 09:04:59
|
Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator/module_mixed In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25803/test/CppGenerator/module_mixed Added Files: .cvsignore Log Message: missing .cvsignore --- NEW FILE: .cvsignore --- xxx |
|
From: Robert L. <rle...@us...> - 2007-03-09 09:04:16
|
Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator/facet_types/impl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25760/test/CppGenerator/facet_types/impl Modified Files: TestMirror_impl.cc Log Message: bug fix: wrong use of local impl. interfaces Index: TestMirror_impl.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppGenerator/facet_types/impl/TestMirror_impl.cc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** TestMirror_impl.cc 5 Jan 2007 14:17:28 -0000 1.11 --- TestMirror_impl.cc 9 Mar 2007 09:04:10 -0000 1.12 *************** *** 2,14 **** /*** * Test_mirror component business logic implementation. ! * ! * // TODO: WRITE YOUR DESCRIPTION HERE! * * @author ! * @version * * This file structure was automatically generated by CCM Tools * <http://ccmtools.sourceforge.net/> and contains a component's ! * implementation classes. ***/ --- 2,14 ---- /*** * Test_mirror component business logic implementation. ! * ! * // TODO: WRITE YOUR DESCRIPTION HERE! * * @author ! * @version * * This file structure was automatically generated by CCM Tools * <http://ccmtools.sourceforge.net/> and contains a component's ! * implementation classes. ***/ *************** *** 45,49 **** throw ( Components::CCMException ) { ! CCM_TypeTest::SmartPtr type_test = ctx->get_connection_type_test(); { --- 45,49 ---- throw ( Components::CCMException ) { ! TypeTest::SmartPtr type_test = ctx->get_connection_type_test(); { *************** *** 57,61 **** assert(short_3 == 3); assert(short_r == 3+7); ! long long_2=3, long_3, long_r; long_r = type_test->op_b2(7,long_2, long_3); --- 57,61 ---- assert(short_3 == 3); assert(short_r == 3+7); ! long long_2=3, long_3, long_r; long_r = type_test->op_b2(7,long_2, long_3); *************** *** 63,67 **** assert(long_3 == 3); assert(long_r == 3+7); ! unsigned short ushort_2=3, ushort_3, ushort_r; ushort_r = type_test->op_b3(7,ushort_2, ushort_3); --- 63,67 ---- assert(long_3 == 3); assert(long_r == 3+7); ! unsigned short ushort_2=3, ushort_3, ushort_r; ushort_r = type_test->op_b3(7,ushort_2, ushort_3); *************** *** 69,73 **** assert(ushort_3 == 3); assert(ushort_r == 3+7); ! unsigned long ulong_2=3, ulong_3, ulong_r; ulong_r = type_test->op_b4(7,ulong_2, ulong_3); --- 69,73 ---- assert(ushort_3 == 3); assert(ushort_r == 3+7); ! unsigned long ulong_2=3, ulong_3, ulong_r; ulong_r = type_test->op_b4(7,ulong_2, ulong_3); *************** *** 75,79 **** assert(ulong_3 == 3); assert(ulong_r == 3+7); ! float float_2=3.0, float_3, float_r; float_r = type_test->op_b5(7.0,float_2, float_3); --- 75,79 ---- assert(ulong_3 == 3); assert(ulong_r == 3+7); ! float float_2=3.0, float_3, float_r; float_r = type_test->op_b5(7.0,float_2, float_3); *************** *** 81,85 **** assert(abs(float_3 - 3.0) < 0.001); assert(abs(float_r - (3.0+7.0)) < 0.001); ! double double_2=3.0, double_3, double_r; double_r = type_test->op_b6(7.0,double_2, double_3); --- 81,85 ---- assert(abs(float_3 - 3.0) < 0.001); assert(abs(float_r - (3.0+7.0)) < 0.001); ! double double_2=3.0, double_3, double_r; double_r = type_test->op_b6(7.0,double_2, double_3); *************** *** 87,91 **** assert(abs(double_3 - 3.0) < 0.000001); assert(abs(double_r - (3.0+7.0)) < 0.000001); ! char char_2=3, char_3, char_r; char_r = type_test->op_b7(7,char_2, char_3); --- 87,91 ---- assert(abs(double_3 - 3.0) < 0.000001); assert(abs(double_r - (3.0+7.0)) < 0.000001); ! char char_2=3, char_3, char_r; char_r = type_test->op_b7(7,char_2, char_3); *************** *** 99,103 **** assert(string_3 == "drei"); assert(string_r == "dreisieben"); ! bool bool_2=false, bool_3, bool_r; bool_r = type_test->op_b9(true, bool_2, bool_3); --- 99,103 ---- assert(string_3 == "drei"); assert(string_r == "dreisieben"); ! bool bool_2=false, bool_3, bool_r; bool_r = type_test->op_b9(true, bool_2, bool_3); *************** *** 105,109 **** assert(bool_3 == false); assert(bool_r == false && true); ! unsigned char uchar_2=3, uchar_3, uchar_r; uchar_r = type_test->op_b10(7,uchar_2, uchar_3); --- 105,109 ---- assert(bool_3 == false); assert(bool_r == false && true); ! unsigned char uchar_2=3, uchar_3, uchar_r; uchar_r = type_test->op_b10(7,uchar_2, uchar_3); *************** *** 112,116 **** assert(uchar_r == 3+7); } ! { wchar_t char_2=3, char_3, char_r; --- 112,116 ---- assert(uchar_r == 3+7); } ! { wchar_t char_2=3, char_3, char_r; *************** *** 125,129 **** assert(string_3 == L"drei"); assert(string_r == L"dreisieben"); ! } --- 125,129 ---- assert(string_3 == L"drei"); assert(string_r == L"dreisieben"); ! } *************** *** 135,140 **** assert(time_t_3 == 3); assert(time_t_r == 3+7); ! ! // Test case: enum Color {red, green, blue, black, orange}; Color Color_2,Color_3, Color_r; Color_2 = Color(blue); --- 135,140 ---- assert(time_t_3 == 3); assert(time_t_r == 3+7); ! ! // Test case: enum Color {red, green, blue, black, orange}; Color Color_2,Color_3, Color_r; Color_2 = Color(blue); |
|
From: Robert L. <rle...@us...> - 2007-03-09 09:03:56
|
Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator/facet_constants/impl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25405/test/CppGenerator/facet_constants/impl Modified Files: TestMirror_impl.cc Log Message: bug fix: wrong use of local impl. interfaces Index: TestMirror_impl.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppGenerator/facet_constants/impl/TestMirror_impl.cc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** TestMirror_impl.cc 5 Jan 2007 14:17:27 -0000 1.11 --- TestMirror_impl.cc 9 Mar 2007 09:03:53 -0000 1.12 *************** *** 5,13 **** * * TestMirror component business logic implementation. ! * ! * // TODO: WRITE YOUR DESCRIPTION HERE! * * @author ! * @version ***/ --- 5,13 ---- * * TestMirror component business logic implementation. ! * ! * // TODO: WRITE YOUR DESCRIPTION HERE! * * @author ! * @version ***/ *************** *** 45,49 **** throw(Components::CCMException) { ! CCM_Constants::SmartPtr constants = ctx->get_connection_iface(); { // const boolean BOOLEAN_CONST = TRUE; --- 45,49 ---- throw(Components::CCMException) { ! Constants::SmartPtr constants = ctx->get_connection_iface(); { // const boolean BOOLEAN_CONST = TRUE; *************** *** 55,59 **** { // const octet OCTET_CONST = 255; ! unsigned char initial = 255; unsigned char result = constants->getOctetValue(); assert(initial == result); --- 55,59 ---- { // const octet OCTET_CONST = 255; ! unsigned char initial = 255; unsigned char result = constants->getOctetValue(); assert(initial == result); *************** *** 96,100 **** { ! // const string STRING_CONST = "1234567890"; string initial = "1234567890"; string result = constants->getStringValue(); --- 96,100 ---- { ! // const string STRING_CONST = "1234567890"; string initial = "1234567890"; string result = constants->getStringValue(); |
|
From: Robert L. <rle...@us...> - 2007-03-09 09:03:34
|
Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator/assembly_nested/impl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25389/test/CppGenerator/assembly_nested/impl Modified Files: SuperTest_basicType_impl.cc SuperTest_userType_impl.cc SuperTestMirror_impl.cc Log Message: bug fix: wrong use of local impl. interfaces Index: SuperTestMirror_impl.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppGenerator/assembly_nested/impl/SuperTestMirror_impl.cc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** SuperTestMirror_impl.cc 5 Jan 2007 14:17:26 -0000 1.10 --- SuperTestMirror_impl.cc 9 Mar 2007 09:03:28 -0000 1.11 *************** *** 1,13 **** /*** ! * This file was automatically generated by * <http://ccmtools.sourceforge.net/> * * SuperTest_mirror component business logic implementation. ! * ! * // TODO: WRITE YOUR DESCRIPTION HERE! * * @author ! * @version ***/ --- 1,13 ---- /*** ! * This file was automatically generated by * <http://ccmtools.sourceforge.net/> * * SuperTest_mirror component business logic implementation. ! * ! * // TODO: WRITE YOUR DESCRIPTION HERE! * * @author ! * @version ***/ *************** *** 47,51 **** { // basic types test cases ! CCM_BasicTypeInterface::SmartPtr basicType = ctx->get_connection_basicType(); --- 47,51 ---- { // basic types test cases ! BasicTypeInterface::SmartPtr basicType = ctx->get_connection_basicType(); *************** *** 74,78 **** assert(ushort_3 == 3); assert(ushort_r == 3+7); ! cout << "BasicTypeInterface::f3() passed" << endl; } --- 74,78 ---- assert(ushort_3 == 3); assert(ushort_r == 3+7); ! cout << "BasicTypeInterface::f3() passed" << endl; } *************** *** 104,108 **** } ! { char char_2=3, char_3, char_r; char_r = basicType->f7(7,char_2, char_3); --- 104,108 ---- } ! { char char_2=3, char_3, char_r; char_r = basicType->f7(7,char_2, char_3); *************** *** 122,126 **** } ! { bool bool_2=false, bool_3, bool_r; bool_r = basicType->f9(true, bool_2, bool_3); --- 122,126 ---- } ! { bool bool_2=false, bool_3, bool_r; bool_r = basicType->f9(true, bool_2, bool_3); *************** *** 144,151 **** { // user types test cases ! CCM_UserTypeInterface::SmartPtr userType = ctx->get_connection_userType(); { ! // Test case: enum Color {red, green, blue, black, orange}; Color Color_2,Color_3, Color_r; Color_2 = Color(blue); --- 144,151 ---- { // user types test cases ! UserTypeInterface::SmartPtr userType = ctx->get_connection_userType(); { ! // Test case: enum Color {red, green, blue, black, orange}; Color Color_2,Color_3, Color_r; Color_2 = Color(blue); *************** *** 160,172 **** // test case: struct Person { long id; string name; }; Person p1, p2, p3, result; ! p1.name = "Egon"; p1.id = 3; ! p2.name = "Andrea"; p2.id = 23; result = userType->f2(p1,p2,p3); assert(p3.name == "Andrea"); ! assert(p3.id == 23); assert(p2.name == "Egon"); ! assert(p2.id == 3); assert(result.name == "EgonAndrea"); assert(result.id == 26); --- 160,172 ---- // test case: struct Person { long id; string name; }; Person p1, p2, p3, result; ! p1.name = "Egon"; p1.id = 3; ! p2.name = "Andrea"; p2.id = 23; result = userType->f2(p1,p2,p3); assert(p3.name == "Andrea"); ! assert(p3.id == 23); assert(p2.name == "Egon"); ! assert(p2.id == 3); assert(result.name == "EgonAndrea"); assert(result.id == 26); *************** *** 178,206 **** Address p1, p2, p3, result; Person person; ! ! p1.street = "Waltendorf"; p1.number = 7; ! person.name = "Egon"; person.id = 3; p1.resident = person; ! ! p2.street = "Petersgasse"; p2.number =17; ! person.name = "Andrea"; person.id = 23; p2.resident = person; ! result = userType->f3(p1,p2,p3); ! assert(p3.street == "Petersgasse"); assert(p3.number == 17); assert(p3.resident.name == "Andrea"); assert(p3.resident.id == 23); ! assert(p2.street == "Waltendorf"); assert(p2.number == 7); assert(p2.resident.name == "Egon"); assert(p2.resident.id == 3); ! assert(result.street == "WaltendorfPetersgasse"); assert(result.number == 24); --- 178,206 ---- Address p1, p2, p3, result; Person person; ! ! p1.street = "Waltendorf"; p1.number = 7; ! person.name = "Egon"; person.id = 3; p1.resident = person; ! ! p2.street = "Petersgasse"; p2.number =17; ! person.name = "Andrea"; person.id = 23; p2.resident = person; ! result = userType->f3(p1,p2,p3); ! assert(p3.street == "Petersgasse"); assert(p3.number == 17); assert(p3.resident.name == "Andrea"); assert(p3.resident.id == 23); ! assert(p2.street == "Waltendorf"); assert(p2.number == 7); assert(p2.resident.name == "Egon"); assert(p2.resident.id == 3); ! assert(result.street == "WaltendorfPetersgasse"); assert(result.number == 24); *************** *** 218,224 **** p2.push_back(i+i); } ! result = userType->f4(p1, p2, p3); ! assert(result.size() == size); for(unsigned int i=0;i<result.size();i++) { --- 218,224 ---- p2.push_back(i+i); } ! result = userType->f4(p1, p2, p3); ! assert(result.size() == size); for(unsigned int i=0;i<result.size();i++) { *************** *** 226,230 **** assert(p == (long)i); } ! assert(p2.size() == size); for(unsigned int i=0;i<p2.size();i++) { --- 226,230 ---- assert(p == (long)i); } ! assert(p2.size() == size); for(unsigned int i=0;i<p2.size();i++) { *************** *** 232,236 **** assert(p == (long)i); } ! assert(p3.size() == size); for(unsigned int i=0;i<p3.size();i++) { --- 232,236 ---- assert(p == (long)i); } ! assert(p3.size() == size); for(unsigned int i=0;i<p3.size();i++) { *************** *** 240,244 **** cout << "UserTypeInterface::f4() passed" << endl; } ! { // Test case: typedef sequence<string> StringList; --- 240,244 ---- cout << "UserTypeInterface::f4() passed" << endl; } ! { // Test case: typedef sequence<string> StringList; *************** *** 249,255 **** p2.push_back("two"); } ! result = userType->f5(p1, p2, p3); ! assert(result.size() == size); for(unsigned int i=0;i<result.size();i++) { --- 249,255 ---- p2.push_back("two"); } ! result = userType->f5(p1, p2, p3); ! assert(result.size() == size); for(unsigned int i=0;i<result.size();i++) { *************** *** 257,261 **** assert(p == "Test"); } ! assert(p2.size() == size); for(unsigned int i=0;i<p2.size();i++) { --- 257,261 ---- assert(p == "Test"); } ! assert(p2.size() == size); for(unsigned int i=0;i<p2.size();i++) { *************** *** 263,267 **** assert(p == "one"); } ! assert(p3.size() == size); for(unsigned int i=0;i<p3.size();i++) { --- 263,267 ---- assert(p == "one"); } ! assert(p3.size() == size); for(unsigned int i=0;i<p3.size();i++) { *************** *** 308,312 **** cout << "UserTypeInterface::f6() passed" << endl; } ! { // test case: typedef long time_t; --- 308,312 ---- cout << "UserTypeInterface::f6() passed" << endl; } ! { // test case: typedef long time_t; Index: SuperTest_userType_impl.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppGenerator/assembly_nested/impl/SuperTest_userType_impl.cc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** SuperTest_userType_impl.cc 5 Jan 2007 14:17:26 -0000 1.11 --- SuperTest_userType_impl.cc 9 Mar 2007 09:03:28 -0000 1.12 *************** *** 1,14 **** /** ! * This file was automatically generated by * <http://ccmtools.sourceforge.net/> * DO NOT EDIT ! * ! * CCM_UserTypeInterface facet class implementation. * ! * // TODO: WRITE YOUR DESCRIPTION HERE! * * @author ! * @version **/ --- 1,14 ---- /** ! * This file was automatically generated by * <http://ccmtools.sourceforge.net/> * DO NOT EDIT ! * ! * CCM_UserTypeInterface facet class implementation. * ! * // TODO: WRITE YOUR DESCRIPTION HERE! * * @author ! * @version **/ *************** *** 35,39 **** throw (Components::CCMException) { ! CCM_UserTypeInterface::SmartPtr inner = component->ctx->get_connection_innerUserType(); return inner->f1(p1,p2,p3); --- 35,39 ---- throw (Components::CCMException) { ! UserTypeInterface::SmartPtr inner = component->ctx->get_connection_innerUserType(); return inner->f1(p1,p2,p3); *************** *** 44,48 **** throw (Components::CCMException) { ! CCM_UserTypeInterface::SmartPtr inner = component->ctx->get_connection_innerUserType(); return inner->f2(p1,p2,p3); --- 44,48 ---- throw (Components::CCMException) { ! UserTypeInterface::SmartPtr inner = component->ctx->get_connection_innerUserType(); return inner->f2(p1,p2,p3); *************** *** 53,57 **** throw (Components::CCMException) { ! CCM_UserTypeInterface::SmartPtr inner = component->ctx->get_connection_innerUserType(); return inner->f3(p1,p2,p3); --- 53,57 ---- throw (Components::CCMException) { ! UserTypeInterface::SmartPtr inner = component->ctx->get_connection_innerUserType(); return inner->f3(p1,p2,p3); *************** *** 62,66 **** throw (Components::CCMException) { ! CCM_UserTypeInterface::SmartPtr inner = component->ctx->get_connection_innerUserType(); return inner->f4(p1,p2,p3); --- 62,66 ---- throw (Components::CCMException) { ! UserTypeInterface::SmartPtr inner = component->ctx->get_connection_innerUserType(); return inner->f4(p1,p2,p3); *************** *** 71,75 **** throw (Components::CCMException) { ! CCM_UserTypeInterface::SmartPtr inner = component->ctx->get_connection_innerUserType(); return inner->f5(p1,p2,p3); --- 71,75 ---- throw (Components::CCMException) { ! UserTypeInterface::SmartPtr inner = component->ctx->get_connection_innerUserType(); return inner->f5(p1,p2,p3); *************** *** 80,84 **** throw (Components::CCMException) { ! CCM_UserTypeInterface::SmartPtr inner = component->ctx->get_connection_innerUserType(); return inner->f6(p1,p2,p3); --- 80,84 ---- throw (Components::CCMException) { ! UserTypeInterface::SmartPtr inner = component->ctx->get_connection_innerUserType(); return inner->f6(p1,p2,p3); *************** *** 89,93 **** throw (Components::CCMException) { ! CCM_UserTypeInterface::SmartPtr inner = component->ctx->get_connection_innerUserType(); return inner->f7(t1,t2,t3); --- 89,93 ---- throw (Components::CCMException) { ! UserTypeInterface::SmartPtr inner = component->ctx->get_connection_innerUserType(); return inner->f7(t1,t2,t3); Index: SuperTest_basicType_impl.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppGenerator/assembly_nested/impl/SuperTest_basicType_impl.cc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** SuperTest_basicType_impl.cc 5 Jan 2007 14:17:26 -0000 1.11 --- SuperTest_basicType_impl.cc 9 Mar 2007 09:03:27 -0000 1.12 *************** *** 1,14 **** /** ! * This file was automatically generated by * <http://ccmtools.sourceforge.net/> * DO NOT EDIT ! * ! * CCM_BasicTypeInterface facet class implementation. * ! * // TODO: WRITE YOUR DESCRIPTION HERE! * * @author ! * @version **/ --- 1,14 ---- /** ! * This file was automatically generated by * <http://ccmtools.sourceforge.net/> * DO NOT EDIT ! * ! * CCM_BasicTypeInterface facet class implementation. * ! * // TODO: WRITE YOUR DESCRIPTION HERE! * * @author ! * @version **/ *************** *** 36,40 **** throw (Components::CCMException) { ! CCM_BasicTypeInterface::SmartPtr inner = component->ctx->get_connection_innerBasicType(); return inner->f1(p1,p2,p3); --- 36,40 ---- throw (Components::CCMException) { ! BasicTypeInterface::SmartPtr inner = component->ctx->get_connection_innerBasicType(); return inner->f1(p1,p2,p3); *************** *** 45,49 **** throw (Components::CCMException) { ! CCM_BasicTypeInterface::SmartPtr inner = component->ctx->get_connection_innerBasicType(); return inner->f2(p1,p2,p3); --- 45,49 ---- throw (Components::CCMException) { ! BasicTypeInterface::SmartPtr inner = component->ctx->get_connection_innerBasicType(); return inner->f2(p1,p2,p3); *************** *** 54,58 **** throw (Components::CCMException) { ! CCM_BasicTypeInterface::SmartPtr inner = component->ctx->get_connection_innerBasicType(); return inner->f3(p1,p2,p3); --- 54,58 ---- throw (Components::CCMException) { ! BasicTypeInterface::SmartPtr inner = component->ctx->get_connection_innerBasicType(); return inner->f3(p1,p2,p3); *************** *** 63,67 **** throw (Components::CCMException) { ! CCM_BasicTypeInterface::SmartPtr inner = component->ctx->get_connection_innerBasicType(); return inner->f4(p1,p2,p3); --- 63,67 ---- throw (Components::CCMException) { ! BasicTypeInterface::SmartPtr inner = component->ctx->get_connection_innerBasicType(); return inner->f4(p1,p2,p3); *************** *** 72,76 **** throw (Components::CCMException) { ! CCM_BasicTypeInterface::SmartPtr inner = component->ctx->get_connection_innerBasicType(); return inner->f5(p1,p2,p3); --- 72,76 ---- throw (Components::CCMException) { ! BasicTypeInterface::SmartPtr inner = component->ctx->get_connection_innerBasicType(); return inner->f5(p1,p2,p3); *************** *** 81,85 **** throw (Components::CCMException) { ! CCM_BasicTypeInterface::SmartPtr inner = component->ctx->get_connection_innerBasicType(); return inner->f6(p1,p2,p3); --- 81,85 ---- throw (Components::CCMException) { ! BasicTypeInterface::SmartPtr inner = component->ctx->get_connection_innerBasicType(); return inner->f6(p1,p2,p3); *************** *** 90,94 **** throw (Components::CCMException) { ! CCM_BasicTypeInterface::SmartPtr inner = component->ctx->get_connection_innerBasicType(); return inner->f7(p1,p2,p3); --- 90,94 ---- throw (Components::CCMException) { ! BasicTypeInterface::SmartPtr inner = component->ctx->get_connection_innerBasicType(); return inner->f7(p1,p2,p3); *************** *** 99,103 **** throw (Components::CCMException) { ! CCM_BasicTypeInterface::SmartPtr inner = component->ctx->get_connection_innerBasicType(); return inner->f8(p1,p2,p3); --- 99,103 ---- throw (Components::CCMException) { ! BasicTypeInterface::SmartPtr inner = component->ctx->get_connection_innerBasicType(); return inner->f8(p1,p2,p3); *************** *** 108,112 **** throw (Components::CCMException) { ! CCM_BasicTypeInterface::SmartPtr inner = component->ctx->get_connection_innerBasicType(); return inner->f9(p1,p2,p3); --- 108,112 ---- throw (Components::CCMException) { ! BasicTypeInterface::SmartPtr inner = component->ctx->get_connection_innerBasicType(); return inner->f9(p1,p2,p3); *************** *** 117,121 **** throw (Components::CCMException) { ! CCM_BasicTypeInterface::SmartPtr inner = component->ctx->get_connection_innerBasicType(); return inner->f10(p1,p2,p3); --- 117,121 ---- throw (Components::CCMException) { ! BasicTypeInterface::SmartPtr inner = component->ctx->get_connection_innerBasicType(); return inner->f10(p1,p2,p3); |
1 message has been excluded from this view by a project administrator.
