Start to integrate the policy attachment builder

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@820125 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 20 insertions, 35 deletions

diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
index cb213e9f11..2779457937 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
@@ -85,7 +85,7 @@ public interface Component extends Base, Extensible, PolicySubject, Cloneable {
      * @param name the reference name
      * @return reference the reference
      */
-    Reference getReference(String name);    
+    ComponentReference getReference(String name);    
 
     /**
      * Returns a list of services exposed by the component.
@@ -100,7 +100,7 @@ public interface Component extends Base, Extensible, PolicySubject, Cloneable {
      * @param name the service name
      * @return service the service
      */
-    Service getService(String name);    
+    ComponentService getService(String name);    
 
     /**
      * Returns a list of properties for the component.
@@ -115,7 +115,7 @@ public interface Component extends Base, Extensible, PolicySubject, Cloneable {
      * @param name the property name
      * @return property the property
      */
-    Property getProperty(String name);    
+    ComponentProperty getProperty(String name);    
 
     /**
      * Returns a constraining type defining the shape of the component.
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
index 0227ab3c65..66e0c9cb59 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
@@ -28,9 +28,6 @@ import org.apache.tuscany.sca.assembly.ComponentService;
 import org.apache.tuscany.sca.assembly.Composite;
 import org.apache.tuscany.sca.assembly.ConstrainingType;
 import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
 import org.apache.tuscany.sca.policy.ExtensionType;
 import org.apache.tuscany.sca.policy.Intent;
 import org.apache.tuscany.sca.policy.PolicySet;
@@ -112,52 +109,40 @@ public class ComponentImpl extends ExtensibleImpl implements Component, Cloneabl
         return properties;
     }
     
-    public Property getProperty(String name){
-        Property property = null;
-        
-        for (Property tmp : getProperties()){
-            if (tmp.getName().equals(name)){
-                property = tmp;
-                break;
+    public ComponentProperty getProperty(String name) {
+        for (ComponentProperty property : getProperties()) {
+            if (property.getName().equals(name)) {
+                return property;
             }
         }
-        
-        return property;
-    }    
+        return null;
+    }
 
     public List<ComponentReference> getReferences() {
         return references;
     }
     
-    public Reference getReference(String name){
-        Reference reference = null;
-        
-        for (Reference tmp : getReferences()){
-            if (tmp.getName().equals(name)){
-                reference = tmp;
-                break;
+    public ComponentReference getReference(String name){
+        for (ComponentReference ref : getReferences()){
+            if (ref.getName().equals(name)){
+                return ref;
             }
         }
-        
-        return reference;
+        return null;
     }      
 
     public List<ComponentService> getServices() {
         return services;
     }
     
-    public Service getService(String name){
-        Service service = null;
-        
-        for (Service tmp : getServices()){
-            if (tmp.getName().equals(name)){
-                service = tmp;
-                break;
+    public ComponentService getService(String name) {
+        for (ComponentService service : getServices()) {
+            if (service.getName().equals(name)) {
+                return service;
             }
         }
-        
-        return service;
-    }    
+        return null;
+    }
 
     public void setConstrainingType(ConstrainingType constrainingType) {
         this.constrainingType = constrainingType;