svn commit: r767420 - /tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java

[edwardsmj]

Author: edwardsmj
Date: Wed Apr 22 09:11:18 2009
New Revision: 767420

URL: http://svn.apache.org/viewvc?rev=767420&view=rev
Log:
Extended Monitoring to give better diagnostic messages which include the name 
of the artifact being processed.

Modified:
    
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java

Modified: 
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java?rev=767420&r1=767419&r2=767420&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
 (original)
+++ 
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
 Wed Apr 22 09:11:18 2009
@@ -83,14 +83,14 @@
         // get the metadata we need from the document
         handler.setErrorHandler(new ErrorHandler() {           
             private String getMessage(SAXParseException e) {
-                return "XMLSchema validation problem in: " + e.getSystemId() + 
", line: " + e.getLineNumber() + ", column: " + e.getColumnNumber() + "\n" + 
e.getMessage();
+                return "XMLSchema validation problem in: " + getArtifactName( 
e.getSystemId() ) + ", line: " + e.getLineNumber() + ", column: " + 
e.getColumnNumber() + "\n" + e.getMessage();
             }
             
             public void error(SAXParseException exception) throws SAXException 
{               
                if (ValidatingXMLStreamReader.this.monitor == null)
                        logger.warning(getMessage(exception));
                else                            
-                       ValidatingXMLStreamReader.this.error("SchemaError", 
ValidatingXMLStreamReader.this.getClass(), exception.getSystemId(), 
+                       ValidatingXMLStreamReader.this.error("SchemaError", 
ValidatingXMLStreamReader.this.getClass(), getArtifactName( 
exception.getSystemId() ), 
                                exception.getLineNumber(), 
exception.getColumnNumber(), exception.getMessage());                           
   
             }
             
@@ -98,7 +98,7 @@
                if (ValidatingXMLStreamReader.this.monitor == null)
                        logger.warning(getMessage(exception));
                else
-                       
ValidatingXMLStreamReader.this.error("SchemaFatalError", 
ValidatingXMLStreamReader.this.getClass(), exception.getSystemId(), 
+                       
ValidatingXMLStreamReader.this.error("SchemaFatalError", 
ValidatingXMLStreamReader.this.getClass(), getArtifactName( 
exception.getSystemId() ), 
                                exception.getLineNumber(), 
exception.getColumnNumber(), exception.getMessage());               
             }
             
@@ -106,9 +106,17 @@
                if (ValidatingXMLStreamReader.this.monitor == null)
                        logger.warning(getMessage(exception));
                else
-                       ValidatingXMLStreamReader.this.warning("SchemaWarning", 
ValidatingXMLStreamReader.this.getClass(), exception.getSystemId(), 
+                       ValidatingXMLStreamReader.this.warning("SchemaWarning", 
ValidatingXMLStreamReader.this.getClass(), getArtifactName( 
exception.getSystemId() ), 
                                exception.getLineNumber(), 
exception.getColumnNumber(), exception.getMessage());                
             }
+            
+            private String getArtifactName( String input ) {
+               String artifactName = input;
+               if( ValidatingXMLStreamReader.this.monitor != null ) {
+                       artifactName = 
ValidatingXMLStreamReader.this.monitor.getArtifactName();
+               }
+               return artifactName;
+            }
         });
     }