Make the remote flag consistent in names and setters/getters

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

5 files changed, 19 insertions, 19 deletions

diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
index 0ffb921d31..cefe585595 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
@@ -133,14 +133,14 @@ public interface Endpoint extends Base, PolicySubject, Cloneable, Serializable {
      * 
      * @return true if the endpoint is remote
      */
-    boolean isRemoteReference();
+    boolean isRemote();
     
     /**
      * Set true if this endpoint represents a serivce that is not
      * running in this JVM
      * 
-     * @param isRemoteReference set to true if the endpoint is remote
+     * @param remote set to true if the endpoint is remote
      */
-    void setIsRemoteReference(boolean isRemoteReference);    
+    void setRemote(boolean remote);    
 
 }
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
index c0cc41c82d..7bb1244045 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
@@ -146,15 +146,15 @@ public interface EndpointReference extends Base, PolicySubject, Cloneable, Seria
      * 
      * @return true if the endpoint is remote
      */
-    boolean isRemoteReference();
+    boolean isRemote();
     
     /**
      * Set true if this endpoint reference refers to an endpoint that 
      * is not running in this endpoint reference
      * 
-     * @param isRemoteReference set to true if the endpoint is remote
+     * @param remote set to true if the endpoint is remote
      */
-    void setIsRemoteReference(boolean isRemoteReference);
+    void setRemote(boolean remote);
 
     /**
      * Set the extension point registry against the endpoint after it is deserialized as
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java
index 34c169bf40..bc8493048b 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java
@@ -211,7 +211,7 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI
                     // add an unresolved endpoint reference with an unresolved endpoint to go with it
                     EndpointReference endpointRef = createEndpointRef( component, reference, true  );
                     endpointRef.setTargetEndpoint(createEndpoint(component, targetName));
-                    endpointRef.setIsRemoteReference(true);
+                    endpointRef.setRemote(true);
                     reference.getEndpointReferences().add(endpointRef);
                     warning(monitor, "ComponentReferenceTargetNotFound",
                             composite,
@@ -247,7 +247,7 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI
                         // they are doing and mark in as already resolved. 
                         endpointRef.setTargetEndpoint(createEndpoint(false));
                     }
-                    endpointRef.setIsRemoteReference(true);
+                    endpointRef.setRemote(true);
                     reference.getEndpointReferences().add(endpointRef);
                     continue;
                 } // end if
@@ -293,7 +293,7 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI
                     Endpoint endpoint = createEndpoint( false );
                     endpoint.setBinding(binding);
                     endpointRef.setTargetEndpoint(endpoint);
-                    endpointRef.setIsRemoteReference(true);
+                    endpointRef.setRemote(true);
                     reference.getEndpointReferences().add(endpointRef);
                 } // end if
             }
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
index 185d4bfa9c..8e2f482f1e 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
@@ -51,7 +51,7 @@ public class EndpointImpl implements Endpoint {
     protected List<EndpointReference> callbackEndpointReferences = new ArrayList<EndpointReference>();
     protected List<PolicySet> policySets = new ArrayList<PolicySet>();
     protected List<Intent> requiredIntents = new ArrayList<Intent>();
-    protected boolean isRemoteReference = false;
+    protected boolean remote = false;
 
     protected EndpointImpl(ExtensionPointRegistry registry) {
         this.registry = registry;
@@ -188,11 +188,11 @@ public class EndpointImpl implements Endpoint {
         this.registry = registry;
     }
     
-    public boolean isRemoteReference() {
-        return isRemoteReference;
+    public boolean isRemote() {
+        return remote;
     }
     
-    public void setIsRemoteReference(boolean isRemoteReference) {
-        this.isRemoteReference = isRemoteReference;
+    public void setRemote(boolean remote) {
+        this.remote = remote;
     }    
 }
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
index dfc9480862..b2e5b8b9cf 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
@@ -49,7 +49,7 @@ public class EndpointReferenceImpl implements EndpointReference {
     protected List<PolicySet> policySets = new ArrayList<PolicySet>();
     protected List<Intent> requiredIntents = new ArrayList<Intent>();
     protected InterfaceContract interfaceContract;
-    protected boolean isRemoteReference = false;
+    protected boolean remote = false;
 
     // the target of the endpoint reference
     protected Endpoint targetEndpoint;
@@ -201,12 +201,12 @@ public class EndpointReferenceImpl implements EndpointReference {
         this.uri = uri;
     }
     
-    public boolean isRemoteReference() {
-        return isRemoteReference;
+    public boolean isRemote() {
+        return remote;
     }
     
-    public void setIsRemoteReference(boolean isRemoteReference) {
-        this.isRemoteReference = isRemoteReference;
+    public void setRemote(boolean remote) {
+        this.remote = remote;
     }
 
     protected void resolve() {