summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/modules/domain-node/src/main/java
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-06-07 13:20:43 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-06-07 13:20:43 +0000
commit835a1f814cc883179ca76fc3071a21e14c339d0f (patch)
tree7df35abebe36474eccd2f0e36af065f0574b4b15 /sca-java-2.x/trunk/modules/domain-node/src/main/java
parented75826096c181c1e217f1d197a9c1acf0093a00 (diff)
Rename 'member' to 'node' as it seems too confusing to try to have a different name for it
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1132994 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/domain-node/src/main/java')
-rw-r--r--sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java6
-rw-r--r--sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java14
2 files changed, 10 insertions, 10 deletions
diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java
index 37eeb4cae4..ad6908723a 100644
--- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java
+++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java
@@ -244,9 +244,9 @@ public interface Node {
void validateContribution(String string) throws ContributionReadException, ValidationException;
// TODO: should these member getters be replaced with a getDomainRegistry?
- List<String> getMembers();
- String getLocalMember();
- String getRunningMember(String contributionURI, String compositeURI);
+ List<String> getNodeNames();
+ String getLocalNodeName();
+ String getRunningNodeName(String contributionURI, String compositeURI);
// TODO: Add methods to get:
// get/display contribution content
diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
index 1b4f0a103f..f611a8bdd3 100644
--- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
+++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
@@ -265,7 +265,7 @@ public class NodeImpl implements Node {
dc.stop();
stoppedComposites.put(key, dc);
} else {
- String member = domainRegistry.getRunningMember(contributionURI, compositeURI);
+ String member = domainRegistry.getRunningNodeName(contributionURI, compositeURI);
if (member == null) {
throw new IllegalStateException("composite not started: " + compositeURI);
}
@@ -401,18 +401,18 @@ public class NodeImpl implements Node {
}
@Override
- public List<String> getMembers() {
- return domainRegistry.getMembers();
+ public List<String> getNodeNames() {
+ return domainRegistry.getNodeNames();
}
@Override
- public String getLocalMember() {
- return domainRegistry.getLocalMember();
+ public String getLocalNodeName() {
+ return domainRegistry.getLocalNodeName();
}
@Override
- public String getRunningMember(String contributionURI, String compositeURI) {
- return domainRegistry.getRunningMember(contributionURI, compositeURI);
+ public String getRunningNodeName(String contributionURI, String compositeURI) {
+ return domainRegistry.getRunningNodeName(contributionURI, compositeURI);
}
}