tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lrese...@apache.org
Subject svn commit: r826362 - /tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
Date Sun, 18 Oct 2009 06:18:19 GMT
Author: lresende
Date: Sun Oct 18 06:18:19 2009
New Revision: 826362

URL: http://svn.apache.org/viewvc?rev=826362&view=rev
Log:
Fixing merge conflict

Modified:
    tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java

Modified: tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java?rev=826362&r1=826361&r2=826362&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
(original)
+++ tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
Sun Oct 18 06:18:19 2009
@@ -51,13 +51,15 @@
     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 @@
      * @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);
         }
     }
+
 }



Mime
View raw message