svn commit: r1137220 - in /tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly: Composite.java impl/CompositeImpl.java

[antelder]

Author: antelder
Date: Sat Jun 18 18:03:56 2011
New Revision: 1137220

URL: http://svn.apache.org/viewvc?rev=1137220&view=rev
Log:
Update Composite to keep track of 'fused' includes. 'Fused' is the term the 
code is using for the merging of the inlcudes inline into the composite. But 
after that process has happened there was nolonger any way to find what 
includes a composite had so this new method enables still finding that

Modified:
    
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
    
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java?rev=1137220&r1=1137219&r2=1137220&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
 Sat Jun 18 18:03:56 2011
@@ -74,6 +74,8 @@ public interface Composite extends Imple
      */
     List<Composite> getIncludes();
 
+    public List<Composite> getFusedIncludes();
+
     /**
      * Returns a list of components contained in this composite.
      *

Modified: 
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java?rev=1137220&r1=1137219&r2=1137220&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
 Sat Jun 18 18:03:56 2011
@@ -43,6 +43,7 @@ public class CompositeImpl extends Imple
     private String contributionURI;
     private List<Component> components = new ArrayList<Component>();
     private List<Composite> includes = new ArrayList<Composite>();
+    private List<Composite> fusedIncludes = new ArrayList<Composite>();
     private QName name;
     private List<Wire> wires = new ArrayList<Wire>();
     private Boolean autowire;
@@ -126,6 +127,9 @@ public class CompositeImpl extends Imple
     public List<Composite> getIncludes() {
         return includes;
     }
+    public List<Composite> getFusedIncludes() {
+        return fusedIncludes;
+    }
 
     public QName getName() {
         return name;