ccmtools-cvs

[Robert L. <rle...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5618/src/ccmtools/CppGenerator

Modified Files:
	CppGenerator.java 
Log Message:
bug fix: name of multi-receptacle map

Index: CppGenerator.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/CppGenerator.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** CppGenerator.java	6 Mar 2007 14:20:40 -0000	1.40
--- CppGenerator.java	7 Mar 2007 12:48:27 -0000	1.41
***************
*** 1022,1031 ****
          else if (data_type.equals("MultipleReceptacleType"))
          {
!             return create_MultipleReceptacleName();
          }
          else if (data_type.equals("MultipleReceptacleName"))
          {
!             return getLocalCxxNamespace(iface, Text.SCOPE_SEPARATOR)
!                     + create_MultipleReceptacleName();
          }
          else if (data_type.startsWith("MOperation"))
--- 1022,1035 ----
          else if (data_type.equals("MultipleReceptacleType"))
          {
!             MUsesDef uses = (MUsesDef) currentNode;
!             MComponentDef component = uses.getComponent();
!             return getMultipleReceptacleType(component, uses);
          }
          else if (data_type.equals("MultipleReceptacleName"))
          {
!             MUsesDef uses = (MUsesDef) currentNode;
!             MComponentDef component = uses.getComponent();
!             return getLocalCxxNamespace(component, Text.SCOPE_SEPARATOR)
!                     + getMultipleReceptacleType(component, uses);
          }
          else if (data_type.startsWith("MOperation"))
***************
*** 1046,1053 ****
      }
  
!     private String create_MultipleReceptacleName()
      {
-         MUsesDef uses = (MUsesDef) currentNode;
-         MComponentDef component = uses.getComponent();
          return component.getIdentifier() + "_" + uses.getIdentifier() + "_Connections";
      }
--- 1050,1055 ----
      }
  
!     private static String getMultipleReceptacleType( MComponentDef component, MUsesDef uses )
      {
          return component.getIdentifier() + "_" + uses.getIdentifier() + "_Connections";
      }