svn commit: r738840 - in /lenya/trunk/src/modules-core/usecase: java/src/org/apache/lenya/cms/usecase/xml/UsecaseErrorHandler.java resources/i18n/cmsui.xml resources/i18n/cmsui_de.xml

Author: andreas
Date: Thu Jan 29 12:40:51 2009
New Revision: 738840

URL: http://svn.apache.org/viewvc?rev=738840&view=rev
Log:
Show line and column numbers in source editor. The numbers aren't correct ATM because of the omitted XML and namespace declarations.

Modified:
    lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/xml/UsecaseErrorHandler.java
    lenya/trunk/src/modules-core/usecase/resources/i18n/cmsui.xml
    lenya/trunk/src/modules-core/usecase/resources/i18n/cmsui_de.xml

Modified: lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/xml/UsecaseErrorHandler.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/xml/UsecaseErrorHandler.java?rev=738840&r1=738839&r2=738840&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/xml/UsecaseErrorHandler.java (original)
+++ lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/xml/UsecaseErrorHandler.java Thu Jan 29 12:40:51 2009
@@ -16,17 +16,27 @@
  */
 package org.apache.lenya.cms.usecase.xml;
 
-import org.apache.lenya.cms.usecase.AbstractUsecase;
+import javax.xml.transform.SourceLocator;
+import javax.xml.transform.TransformerException;
 
-import com.thaiopensource.xml.sax.ErrorHandlerImpl;
+import org.apache.lenya.cms.usecase.AbstractUsecase;
+import org.apache.xml.utils.SAXSourceLocator;
+import org.apache.xml.utils.WrappedRuntimeException;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 
 /**
  * Error handler which outputs its errors to usecase messages.
  */
-public class UsecaseErrorHandler extends ErrorHandlerImpl {
-    
+public class UsecaseErrorHandler implements ErrorHandler {
+
+    protected static final String MSG_ERROR = "usecase.validationError";
+    protected static final String MSG_WARNING = "usecase.validationWarning";
+    protected static final String MSG_FATAL = "usecase.validationFatal";
+
     private AbstractUsecase usecase;
-    
+
     /**
      * Ctor.
      * @param usecase The usecase.
@@ -35,8 +45,24 @@
         this.usecase = usecase;
     }
 
-    public void print(String message) {
-        this.usecase.addErrorMessage(message);
+    protected void addErrorMessage(SAXParseException e, String message) {
+        String[] params = new String[3];
+        params[0] = e.getMessage();
+        params[1] = Integer.toString(e.getLineNumber());
+        params[2] = Integer.toString(e.getColumnNumber());
+        this.usecase.addErrorMessage(message, params);
+    }
+
+    public void error(SAXParseException e) throws SAXException {
+        addErrorMessage(e, MSG_ERROR);
+    }
+
+    public void fatalError(SAXParseException e) throws SAXException {
+        addErrorMessage(e, MSG_FATAL);
+    }
+
+    public void warning(SAXParseException e) throws SAXException {
+        addErrorMessage(e, MSG_WARNING);
     }
 
 }

Modified: lenya/trunk/src/modules-core/usecase/resources/i18n/cmsui.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/resources/i18n/cmsui.xml?rev=738840&r1=738839&r2=738840&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/usecase/resources/i18n/cmsui.xml (original)
+++ lenya/trunk/src/modules-core/usecase/resources/i18n/cmsui.xml Thu Jan 29 12:40:51 2009
@@ -25,6 +25,10 @@
   <message key="objects-checked-out">
     Involved objects are checked out.
   </message>
-  <message key="Access denied">Access denied</message>
+  <message key="Access denied">Access denied</message>
+  
+  <message key="usecase.validationError">Validation error: {0} (line {1}, column {2})</message>
+  <message key="usecase.validationWarning">Validation warning: {0} (line {1}, column {2})</message>
+  <message key="usecase.validationFatal">Fatal validation error: {0} (line {1}, column {2})</message>
   
 </catalogue>

Modified: lenya/trunk/src/modules-core/usecase/resources/i18n/cmsui_de.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/resources/i18n/cmsui_de.xml?rev=738840&r1=738839&r2=738840&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/usecase/resources/i18n/cmsui_de.xml (original)
+++ lenya/trunk/src/modules-core/usecase/resources/i18n/cmsui_de.xml Thu Jan 29 12:40:51 2009
@@ -26,5 +26,10 @@
     Beteiligte Objekte sind ausgecheckt.
   </message>
   <message key="Access denied">Zugriff verweigert</message>
+  
+  <message key="usecase.validationError">Validierungsfehler: {0} (Zeile {1}, Spalte {2})</message>
+  <message key="usecase.validationWarning">Validierungswarnung: {0} (Zeile {1}, Spalte {2})</message>
+  <message key="usecase.validationFatal">Fataler Validierungsfehler: {0} (Zeile {1}, Spalte {2})</message>
+  
   
 </catalogue>