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 2009/10/20 21:27:27 UTC

svn commit: r827767 - /tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java

Author: slaws
Date: Tue Oct 20 19:27:27 2009
New Revision: 827767

URL: http://svn.apache.org/viewvc?rev=827767&view=rev
Log:
Get monitor from context now

Modified:
    tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java

Modified: tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java?rev=827767&r1=827766&r2=827767&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java Tue Oct 20 19:27:27 2009
@@ -42,7 +42,6 @@
 
     private Contribution contribution;
     private Map<QName, Composite> map = new HashMap<QName, Composite>();
-    private Monitor monitor;
 
     public CompositeModelResolver(Contribution contribution, FactoryExtensionPoint modelFactories) {
         this.contribution = contribution;
@@ -52,7 +51,7 @@
         Composite composite = (Composite)resolved;
         Composite old = map.put(composite.getName(), composite);
         if (old != null) {
-            Monitor.error(monitor,
+            Monitor.error(context.getMonitor(),
                           this,
                           Messages.RESOURCE_BUNDLE,
                           "DuplicateCompositeName",