summaryrefslogtreecommitdiffstats
path: root/java/sca
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-10-18 06:18:19 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-10-18 06:18:19 +0000
commit4d5d7b545c47fc4b6049f072ce9702237c43ba5d (patch)
tree89e6a2f4b51367f5b3be8e2f5a7e80b64c077e58 /java/sca
parent0bf2e8388270c5ecad6af5e4caf96e9cb45ef400 (diff)
Fixing merge conflict
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@826362 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca')
-rw-r--r--java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java9
1 files changed, 6 insertions, 3 deletions
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 68109b0f28..1c86bcc957 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,13 +51,15 @@ public class ContributionMetadataDocumentProcessor implements URLArtifactProcess
private final XMLInputFactory inputFactory;
public ContributionMetadataDocumentProcessor(XMLInputFactory inputFactory,
- StAXArtifactProcessor staxProcessor) {
+ StAXArtifactProcessor staxProcessor,
+ Monitor monitor) {
this.inputFactory = inputFactory;
this.staxProcessor = staxProcessor;
}
public ContributionMetadataDocumentProcessor(FactoryExtensionPoint modelFactories,
- StAXArtifactProcessor staxProcessor) {
+ StAXArtifactProcessor staxProcessor,
+ Monitor monitor) {
this.inputFactory = modelFactories.getFactory(ValidatingXMLInputFactory.class);
this.staxProcessor = staxProcessor;
}
@@ -115,10 +117,11 @@ public class ContributionMetadataDocumentProcessor implements URLArtifactProcess
* @param message
* @param model
*/
- private void error(String message, Object model, Exception ex) {
+ private void error(Monitor monitor, String message, Object model, Exception ex) {
if (monitor != null) {
Problem problem = monitor.createProblem(this.getClass().getName(), "contribution-xml-validation-messages", Severity.ERROR, model, message, ex);
monitor.problem(problem);
}
}
+
}