From 08f376c0fe3fd893882de787bf6c263ecb8599f8 Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 18 Oct 2009 06:19:06 +0000
Subject: Properly fixing merge conflict

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@826363 13f79535-47bb-0310-9956-ffa450edef68
---
 .../xml/ContributionGeneratedMetadataDocumentProcessor.java    | 10 ++++------
 .../xml/ContributionMetadataDocumentProcessor.java             |  6 ++----
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'java/sca/modules/contribution/src/main')

diff --git a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
index 0a4df948e8..0ad3ecbd4d 100644
--- a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
+++ b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
@@ -32,15 +32,13 @@ import org.apache.tuscany.sca.monitor.Monitor;
 public class ContributionGeneratedMetadataDocumentProcessor extends ContributionMetadataDocumentProcessor {
 
     public ContributionGeneratedMetadataDocumentProcessor(XMLInputFactory inputFactory,
-                                                          StAXArtifactProcessor staxProcessor,
-                                                          Monitor monitor) {
-        super(inputFactory, staxProcessor, monitor);
+                                                          StAXArtifactProcessor staxProcessor) {
+        super(inputFactory, staxProcessor);
     }
 
     public ContributionGeneratedMetadataDocumentProcessor(FactoryExtensionPoint modelFactories,
-                                                          StAXArtifactProcessor staxProcessor,
-                                                          Monitor monitor) {
-        super(modelFactories, staxProcessor, monitor);
+                                                          StAXArtifactProcessor staxProcessor) {
+        super(modelFactories, staxProcessor);
     }
 
     @Override
diff --git a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
index 1c86bcc957..63521f8977 100644
--- a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
+++ b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
@@ -51,15 +51,13 @@ public class ContributionMetadataDocumentProcessor implements URLArtifactProcess
     private final XMLInputFactory inputFactory;
 
     public ContributionMetadataDocumentProcessor(XMLInputFactory inputFactory,
-                                                 StAXArtifactProcessor staxProcessor,
-                                                 Monitor monitor) {
+                                                 StAXArtifactProcessor staxProcessor) {
         this.inputFactory = inputFactory;
         this.staxProcessor = staxProcessor;
     }
 
     public ContributionMetadataDocumentProcessor(FactoryExtensionPoint modelFactories,
-                                                 StAXArtifactProcessor staxProcessor,
-                                                 Monitor monitor) {
+                                                 StAXArtifactProcessor staxProcessor) {
         this.inputFactory = modelFactories.getFactory(ValidatingXMLInputFactory.class);
         this.staxProcessor = staxProcessor;
     }
-- 
cgit v1.2.3