[ccmtools-cvs] ccmtools/src/ccmtools/generator/java/metamodel ComponentDef.java, 1.21, 1.22 ProvidesDef.java, 1.20, 1.21

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

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30786/src/ccmtools/generator/java/metamodel

Modified Files:
	ComponentDef.java ProvidesDef.java 
Log Message:
Java assemblies

Index: ComponentDef.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel/ComponentDef.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ComponentDef.java	16 Feb 2007 13:34:20 -0000	1.21
--- ComponentDef.java	19 Feb 2007 09:09:42 -0000	1.22
***************
*** 332,360 ****
              {
                  Connection c = (Connection) e;
                  Port target = c.getReceptacle();
!                 if (target.getComponent() != null)
                  {
!                     StringBuffer code = new StringBuffer();
                      code.append(TAB3);
                      code.append(target.getComponent());
                      code.append("_.connect_");
!                     code.append(target.getConnector());
                      code.append("(");
!                     Port source = c.getFacet();
!                     if (source.getComponent() == null)
!                     {
!                         // connect an outer receptacle to the receptacle of an inner component
!                         code.append("ctx.get_connection_");
!                     }
!                     else
!                     {
!                         // connect facet and receptacle if inner components
!                         code.append(source.getComponent());
!                         code.append("_.provide_");
!                     }
!                     code.append(source.getConnector());
!                     code.append("());");
!                     list.add(code.toString());
                  }
              }
              else if (e instanceof Attribute)
--- 332,375 ----
              {
                  Connection c = (Connection) e;
+                 StringBuffer code = new StringBuffer();
+                 String code_tail;
                  Port target = c.getReceptacle();
!                 String target_name=target.getConnector();
!                 if(target.getComponent()==null)
                  {
!                     // connect to an outer facet
!                     String check=TAB3+"if("+target_name+"_!=null)";
!                     list.add(check);
!                     code.append(TAB4);
!                     code.append(target_name);
!                     code.append("_.target = ");
!                     code_tail = ";";
!                 }
!                 else
!                 {
!                     // connect to the receptacle of an inner component
                      code.append(TAB3);
                      code.append(target.getComponent());
                      code.append("_.connect_");
!                     code.append(target_name);
                      code.append("(");
!                     code_tail = ");";
!                 }
!                 Port source = c.getFacet();
!                 if (source.getComponent() == null)
!                 {
!                     // connect from an outer receptacle
!                     code.append("ctx.get_connection_");
!                 }
!                 else
!                 {
!                     // connect from the facet of an inner component
!                     code.append(source.getComponent());
!                     code.append("_.provide_");
                  }
+                 code.append(source.getConnector());
+                 code.append("()");
+                 code.append(code_tail);
+                 list.add(code.toString());
              }
              else if (e instanceof Attribute)
***************
*** 392,418 ****
      }
  
-     public String getInnerFacet( ProvidesDef facet )
-     {
-         String name = facet.getIdentifier();
-         for (AssemblyElement e : assembly_.getElements())
-         {
-             if (e instanceof Connection)
-             {
-                 Connection c = (Connection) e;
-                 Port target = c.getReceptacle();
-                 if (target.getComponent() == null && target.getConnector().equals(name))
-                 {
-                     Port source = c.getFacet();
-                     if (source.getComponent() == null)
-                     {
-                         // special case: connect an outer facet to an outer receptacle
-                         return "ctx.get_connection_" + source.getConnector() + "()";
-                     }
-                     return source.getComponent() + "_.provide_" + source.getConnector() + "()";
-                 }
-             }
-         }
-         throw new RuntimeException("facet \"" + name + "\" is not connected");
-     }
  
      /***********************************************************************************************
--- 407,410 ----

Index: ProvidesDef.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel/ProvidesDef.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ProvidesDef.java	16 Feb 2007 12:34:31 -0000	1.20
--- ProvidesDef.java	19 Feb 2007 09:09:42 -0000	1.21
***************
*** 124,139 ****
      }
  
!     public String generateGetMethodAssemblyImplementation(String inner_facet)
      {
-         inner_facet_ = inner_facet;
          return new ProvidesDefGetMethodAssemblyImplementationTemplate().generate(this);
      }
-     
-     private String inner_facet_;
-     
-     public String getAssemblyFacet()
-     {
-         return inner_facet_;
-     }
  
      // Generate SourceFile objects --------------------------------------------
--- 124,131 ----
      }
  
!     public String generateGetMethodAssemblyImplementation()
      {
          return new ProvidesDefGetMethodAssemblyImplementationTemplate().generate(this);
      }
  
      // Generate SourceFile objects --------------------------------------------