You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2007/06/19 17:14:15 UTC
svn commit: r548759 - in /incubator/tuscany/java/sca/modules/topology/src:
main/java/org/apache/tuscany/sca/topology/
main/java/org/apache/tuscany/sca/topology/impl/
test/java/org/apache/tuscany/sca/topology/
Author: slaws
Date: Tue Jun 19 08:14:14 2007
New Revision: 548759
URL: http://svn.apache.org/viewvc?view=rev&rev=548759
Log:
Shuffle the domain info round a bit. I'm trying to be agnostic in the domain cardinality debate thus far
TUSCANY-1338
Modified:
incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Node.java
incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/NodeImpl.java
incubator/tuscany/java/sca/modules/topology/src/test/java/org/apache/tuscany/sca/topology/TopologyFactoryTestCase.java
Modified: incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Node.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Node.java?view=diff&rev=548759&r1=548758&r2=548759
==============================================================================
--- incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Node.java (original)
+++ incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Node.java Tue Jun 19 08:14:14 2007
@@ -20,6 +20,7 @@
package org.apache.tuscany.sca.topology;
import java.util.List;
+import java.util.Set;
/**
* Represents an SCA node implementation. An SCA node is a running instance
@@ -43,6 +44,13 @@
* @param name
*/
public void setName(String name);
+
+ /**
+ * Get domain names
+ *
+ * @return
+ */
+ public Set<String> getDomainNames();
/**
* Return the Scheme/base URL pairs that this node uses for the
Modified: incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/NodeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/NodeImpl.java?view=diff&rev=548759&r1=548758&r2=548759
==============================================================================
--- incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/NodeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/NodeImpl.java Tue Jun 19 08:14:14 2007
@@ -22,6 +22,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Set;
import org.apache.tuscany.sca.topology.Node;
import org.apache.tuscany.sca.topology.Scheme;
@@ -34,10 +35,22 @@
*/
public class NodeImpl implements Node {
- private HashMap<String, List<Scheme>> schemeBaseURLs = new HashMap<String, List<Scheme>>();
- private HashMap<String, List<Component>> components = new HashMap<String, List<Component>>();
+ private HashMap<String, DomainContainer> nodeDomain = new HashMap<String, DomainContainer>();
private String name;
+ public class DomainContainer {
+ private List<Scheme> schemes = new ArrayList<Scheme>();
+ private List<Component> components = new ArrayList<Component>();
+
+ public List<Scheme> getSchemes() {
+ return schemes;
+ }
+
+ public List<Component> getComponents() {
+ return components;
+ }
+ }
+
/**
* Constructs a new node.
*/
@@ -63,6 +76,15 @@
}
/**
+ * Get domain names
+ *
+ * @return
+ */
+ public Set<String> getDomainNames() {
+ return nodeDomain.keySet();
+ }
+
+ /**
* Return the Scheme/base URL pairs that this node uses for the
* specified domain.
*
@@ -70,13 +92,13 @@
* @return
*/
public List<Scheme> getSchemes(String domainName) {
- List<Scheme> schemeList = schemeBaseURLs.get(domainName);
+ DomainContainer container = nodeDomain.get(domainName);
- if (schemeList == null) {
- schemeList = new ArrayList<Scheme>();
- schemeBaseURLs.put(domainName, schemeList);
+ if (container == null) {
+ container = new DomainContainer();
+ nodeDomain.put(domainName, container);
}
- return schemeList;
+ return container.getSchemes();
}
/**
@@ -87,12 +109,12 @@
* @return
*/
public List<Component> getComponents(String domainName) {
- List<Component> componentList = components.get(domainName);
+ DomainContainer container = nodeDomain.get(domainName);
- if (componentList == null) {
- componentList = new ArrayList<Component>();
- components.put(domainName, componentList);
+ if (container == null) {
+ container = new DomainContainer();
+ nodeDomain.put(domainName, container);
}
- return componentList;
+ return container.getComponents();
}
}
Modified: incubator/tuscany/java/sca/modules/topology/src/test/java/org/apache/tuscany/sca/topology/TopologyFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/topology/src/test/java/org/apache/tuscany/sca/topology/TopologyFactoryTestCase.java?view=diff&rev=548759&r1=548758&r2=548759
==============================================================================
--- incubator/tuscany/java/sca/modules/topology/src/test/java/org/apache/tuscany/sca/topology/TopologyFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/topology/src/test/java/org/apache/tuscany/sca/topology/TopologyFactoryTestCase.java Tue Jun 19 08:14:14 2007
@@ -20,8 +20,6 @@
import java.util.List;
-import javax.xml.namespace.QName;
-
import junit.framework.TestCase;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org