[ccmtools-cvs] ccmtools/test/JavaAssembly/prototype/wamas C3i1Impl.java, 1.3, 1.4 C3Impl.java, 1.2, 1.3 Main.java, 1.2, 1.3

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

Update of /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype/wamas
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30310/test/JavaAssembly/prototype/wamas

Modified Files:
	C3i1Impl.java C3Impl.java Main.java 
Log Message:
new facet adapter concept

Index: C3i1Impl.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype/wamas/C3i1Impl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** C3i1Impl.java	15 Feb 2007 12:21:19 -0000	1.3
--- C3i1Impl.java	19 Feb 2007 09:08:47 -0000	1.4
***************
*** 32,39 ****
      private C3Impl component;
  
!     public C3i1Impl(C3Impl component, wamas.Test.I1 target)
      {
          this.component = component;
-         this.target = target;
      }
  
--- 32,41 ----
      private C3Impl component;
  
!     // connect comp1.i1 to this.i1;
!     wamas.Test.I1 target;
! 
!     public C3i1Impl(C3Impl component)
      {
          this.component = component;
      }
  
***************
*** 43,49 ****
  
  
-     // connect comp1.i1 to this.i1;
-     private wamas.Test.I1 target;
- 
      public String value()
          throws CCMException
--- 45,48 ----

Index: Main.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype/wamas/Main.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Main.java	15 Feb 2007 12:21:20 -0000	1.2
--- Main.java	19 Feb 2007 09:08:48 -0000	1.3
***************
*** 9,21 ****
              H3 home = (H3)H3Deployment.create();
              C3 component = home.create();
              component.configuration_complete();
              System.out.println("C3.b = "+component.b());
-             wamas.Test.I1 c3i1 = component.provide_i1();
              System.out.println("C3->I1.value() = "+c3i1.value());
  
              wamas.Test.H1 h1 = (wamas.Test.H1)wamas.Test.H1Deployment.create();
              wamas.Test.C1 c1 = h1.create();
-             c1.configuration_complete();
              wamas.Test.I1 c1i1 = c1.provide_i1();
              System.out.println("C1->I1.value() = "+c1i1.value());
          }
--- 9,21 ----
              H3 home = (H3)H3Deployment.create();
              C3 component = home.create();
+             wamas.Test.I1 c3i1 = component.provide_i1();
              component.configuration_complete();
              System.out.println("C3.b = "+component.b());
              System.out.println("C3->I1.value() = "+c3i1.value());
  
              wamas.Test.H1 h1 = (wamas.Test.H1)wamas.Test.H1Deployment.create();
              wamas.Test.C1 c1 = h1.create();
              wamas.Test.I1 c1i1 = c1.provide_i1();
+             c1.configuration_complete();
              System.out.println("C1->I1.value() = "+c1i1.value());
          }

Index: C3Impl.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype/wamas/C3Impl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** C3Impl.java	15 Feb 2007 12:21:20 -0000	1.2
--- C3Impl.java	19 Feb 2007 09:08:48 -0000	1.3
***************
*** 88,95 ****
  
  
      public wamas.Test.CCM_I1 get_i1()
      {
!         // connect comp1.i1 to this.i1;
!         return new wamas.C3i1Impl(this, comp1_.provide_i1());
      }
  
--- 88,98 ----
  
  
+     private wamas.C3i1Impl i1_;
+ 
      public wamas.Test.CCM_I1 get_i1()
      {
!         if(i1_==null)
!             i1_ = new wamas.C3i1Impl(this);
!         return i1_;
      }
  
***************
*** 123,126 ****
--- 126,133 ----
              comp1_.connect_i2(comp2_.provide_i2());
  
+             // connect comp1.i1 to this.i1;
+             if(i1_!=null)
+                 i1_.target = comp1_.provide_i1();
+ 
              // connect this.i3 to comp2.i3;
              comp2_.connect_i3(ctx.get_connection_i3());