Merging the 1.x delta on top of the equinox based modules

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

1 files changed, 6 insertions, 4 deletions

diff --git a/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java b/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
index 8b0b9451fb..1c68ab5bc1 100644
--- a/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
+++ b/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
@@ -47,10 +47,6 @@ class AtomBindingImpl implements AtomBinding, PolicySetAttachPoint {
     private IntentAttachPointType intentAttachPointType;
     private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
 
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
-    }
-
     public String getName() {
         return name;
     }
@@ -84,6 +80,8 @@ class AtomBindingImpl implements AtomBinding, PolicySetAttachPoint {
         // The binding is always resolved
     }
 
+    //Policy related getters/setters
+    
     public List<PolicySet> getPolicySets() {
         return policySets;
     }
@@ -107,6 +105,10 @@ class AtomBindingImpl implements AtomBinding, PolicySetAttachPoint {
     public void setRequiredIntents(List<Intent> intents) {
         this.requiredIntents = intents;
     }
+    
+    public List<PolicySet> getApplicablePolicySets() {
+        return applicablePolicySets;
+    }
 
     @Override
     public Object clone() throws CloneNotSupportedException {