[ccmtools-cvs] ccmtools/src/ccmtools/generator/java/metamodel ComponentDef.java, 1.25, 1.26

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

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

Modified Files:
	ComponentDef.java 
Log Message:
using alias names for inner components

Index: ComponentDef.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel/ComponentDef.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** ComponentDef.java	20 Feb 2007 13:17:44 -0000	1.25
--- ComponentDef.java	23 Feb 2007 14:15:57 -0000	1.26
***************
*** 312,331 ****
          {
              MComponentDef comp_def = assembly_local_components_.get(key);
!             List homes = comp_def.getHomes();
!             if (homes.size() > 0)
              {
!                 // using first home
!                 MHomeDef home = (MHomeDef) homes.get(0);
!                 String hn = CcmModelHelper.getAbsoluteName(home, ".");
!                 String code = TAB3 + key + "_ = ((" + hn + ")" + hn
!                         + "Deployment.create()).create();";
!                 list.add(code);
              }
              else
              {
!                 // no home
!                 String cn = CcmModelHelper.getAbsoluteName(comp_def, ".");
!                 String code = TAB3 + key + "_ = new " + cn + "Adapter(new " + cn + "Impl());";
!                 list.add(code);
              }
          }
--- 312,346 ----
          {
              MComponentDef comp_def = assembly_local_components_.get(key);
!             String comp_alias = assembly_.getComponents().get(key).getAlias();
!             if (comp_alias != null)
              {
!                 // calling home-finder
!                 String cn = CcmModelHelper.getAbsoluteName(comp_def, ".");
!                 StringBuilder code = new StringBuilder();
!                 code.append(TAB3).append(key).append("_ = (").append(cn).append("Adapter)");
!                 code.append("((Components.KeylessCCMHome)");
!                 code.append("Components.HomeFinder.instance().find_home_by_name(\"");
!                 code.append(comp_alias).append("\")).create_component();");
!                 list.add(code.toString());
              }
              else
              {
!                 List homes = comp_def.getHomes();
!                 if (homes.size() > 0)
!                 {
!                     // using first home
!                     MHomeDef home = (MHomeDef) homes.get(0);
!                     String hn = CcmModelHelper.getAbsoluteName(home, ".");
!                     String code = TAB3 + key + "_ = ((" + hn + ")" + hn
!                             + "Deployment.create()).create();";
!                     list.add(code);
!                 }
!                 else
!                 {
!                     // no home
!                     String cn = CcmModelHelper.getAbsoluteName(comp_def, ".");
!                     String code = TAB3 + key + "_ = new " + cn + "Adapter(new " + cn + "Impl());";
!                     list.add(code);
!                 }
              }
          }