Author: jeremias
Date: Thu Mar 6 02:28:14 2008
New Revision: 634209
URL: http://svn.apache.org/viewvc?rev=634209&view=rev
Log:
Made FOPException localizable.
Modified:
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/apps/FOPException.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/events/EventExceptionManager.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/events/EventFormatter_de.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/util/XMLResourceBundle.java
Modified:
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/apps/FOPException.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/apps/FOPException.java?rev=634209&r1=634208&r2=634209&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/apps/FOPException.java
(original)
+++
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/apps/FOPException.java
Thu Mar 6 02:28:14 2008
@@ -32,6 +32,8 @@
private String systemId;
private int line;
private int column;
+
+ private String localizedMessage;
/**
* Constructs a new FOP exception with the specified detail message.
@@ -210,5 +212,24 @@
}
}
}
+
+ /**
+ * Sets the localized message for this exception.
+ * @param msg the localized message
+ */
+ public void setLocalizedMessage(String msg) {
+ this.localizedMessage = msg;
+ }
+
+ /** [EMAIL PROTECTED] */
+ public String getLocalizedMessage() {
+ if (this.localizedMessage != null) {
+ return this.localizedMessage;
+ } else {
+ return super.getLocalizedMessage();
+ }
+ }
+
+
}
Modified:
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/events/EventExceptionManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/events/EventExceptionManager.java?rev=634209&r1=634208&r2=634209&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/events/EventExceptionManager.java
(original)
+++
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/events/EventExceptionManager.java
Thu Mar 6 02:28:14 2008
@@ -47,7 +47,6 @@
*/
public static void throwException(Event event, String exceptionClass)
throws Throwable {
- //TODO Localize exceptions!
//TODO Complain if there's no ExceptionFactory for the given
exceptionClass
ExceptionFactory factory =
(ExceptionFactory)EXCEPTION_FACTORIES.get(exceptionClass);
@@ -70,6 +69,9 @@
Locator loc = (Locator)event.getParam("loc");
String msg = EventFormatter.format(event, Locale.ENGLISH);
ValidationException ex = new ValidationException(msg, loc);
+ if (!Locale.ENGLISH.equals(Locale.getDefault())) {
+ ex.setLocalizedMessage(EventFormatter.format(event));
+ }
return ex;
}
Modified:
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/events/EventFormatter_de.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/events/EventFormatter_de.xml?rev=634209&r1=634208&r2=634209&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/events/EventFormatter_de.xml
(original)
+++
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/events/EventFormatter_de.xml
Thu Mar 6 02:28:14 2008
@@ -17,6 +17,7 @@
-->
<!-- $Id$ -->
<catalogue xml:lang="de">
- <message key="org.apache.fop.fo.FOValidationEventProducer.tooManyNodes">In
"{elementName}" darf nur ein einziges "{offendingNode}" vorkommen![ Siehe
Position {loc}]</message>
- <message
key="org.apache.fop.fo.FOValidationEventProducer.missingProperty">Dem Element
"{elementName}" fehlt ein verlangtes Property "{propertyName}"![ Siehe Position
{loc}]</message>
+ <message key="locator">[ (Siehe Position {loc})| (Siehe
{#gatherContextInfo})| (Keine Kontextinformationen verfügbar)]</message>
+ <message key="org.apache.fop.fo.FOValidationEventProducer.tooManyNodes">In
"{elementName}" darf nur ein einziges "{offendingNode}"
vorkommen!{{locator}}</message>
+ <message
key="org.apache.fop.fo.FOValidationEventProducer.missingProperty">Dem Element
"{elementName}" fehlt ein verlangtes Property
"{propertyName}"!{{locator}}</message>
</catalogue>
Modified:
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/util/XMLResourceBundle.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/util/XMLResourceBundle.java?rev=634209&r1=634208&r2=634209&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/util/XMLResourceBundle.java
(original)
+++
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/util/XMLResourceBundle.java
Thu Mar 6 02:28:14 2008
@@ -319,6 +319,11 @@
return resources.get(key);
}
+ /** [EMAIL PROTECTED] */
+ public String toString() {
+ return "XMLResourceBundle: " + getLocale();
+ }
+
private class CatalogueHandler extends DefaultHandler {
private static final String CATALOGUE = "catalogue";
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
