summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2009-10-20 19:27:27 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2009-10-20 19:27:27 +0000
commit7e3adb0f57b5e22fc73d2efff17f4f09ea76509f (patch)
treeaada302be900502fbd77b8c815ec484a1c64118c /java
parent6a51cb0e3f70c5847e478ddd4eea559ec83d5982 (diff)
Get monitor from context now
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@827767 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rw-r--r--java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
index cd2aa364bd..9b02df8b7a 100644
--- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
+++ b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
@@ -42,7 +42,6 @@ public class CompositeModelResolver implements ModelResolver {
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 @@ public class CompositeModelResolver implements ModelResolver {
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",