You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/02/28 01:26:01 UTC

svn commit: r631788 - /incubator/tuscany/java/sca/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java

Author: jsdelfino
Date: Wed Feb 27 16:25:50 2008
New Revision: 631788

URL: http://svn.apache.org/viewvc?rev=631788&view=rev
Log:
Added implementation of the resolve method to resolve contributions in a workspace.

Modified:
    incubator/tuscany/java/sca/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java

Modified: incubator/tuscany/java/sca/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java?rev=631788&r1=631787&r2=631788&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java Wed Feb 27 16:25:50 2008
@@ -22,6 +22,8 @@
 import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
 import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
 
+import java.util.List;
+
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
@@ -127,7 +129,16 @@
     }
     
     public void resolve(Workspace workspace, ModelResolver resolver) throws ContributionResolveException {
-        //TODO Resolve contribution models
+        
+        // Resolve the contributions referenced by the workspace
+        List<Contribution> contributions = workspace.getContributions();
+        for (int i = 0, n = contributions.size(); i < n; i++) {
+            Contribution contribution = contributions.get(i);
+            Contribution resolved = resolver.resolveModel(Contribution.class, contribution);
+            if (resolved != contribution) {
+                contributions.set(i, resolved);
+            }
+        }
     }
     
     public QName getArtifactType() {



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org