This applies Tony Graham's modification of Ross Golder's unicode fix. I

don't speak german, so I assume it's right. This also fixes the
properties.xml file as per Mark Reeves message.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193723 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/codegen/properties.xml b/src/codegen/properties.xml
index 92cd96932f9842cc037a8bdcf4dc740ba3d318b3..7cde2e58877ae637d15fca1baf08c3a3e7125f1b 100644 (file)
--- a/src/codegen/properties.xml
+++ b/src/codegen/properties.xml
@@ -195,10 +195,10 @@
     <inherited>true</inherited>
     <datatype>
       <enumeration>
-        <value const="CENTER">center</value>
-        <value const="END">end</value>
         <value const="START">start</value>
+        <value const="END">end</value>
         <value const="JUSTIFY">justify</value>
+        <value const="CENTER">center</value>
       </enumeration>
     </datatype>
     <default>start</default>

diff --git a/src/org/apache/fop/viewer/UserMessage.java b/src/org/apache/fop/viewer/UserMessage.java
index a529e375218ef7d0435eb7c251a19ac3fe2dfc44..512a6c728f17a334517d076a08fe1e9f5e4e3fc1 100644 (file)
--- a/src/org/apache/fop/viewer/UserMessage.java
+++ b/src/org/apache/fop/viewer/UserMessage.java
@@ -26,6 +26,9 @@ import javax.swing.JComponent.*;
  *
  * @changed 09.06.99 Juergen.Verwohlt@jCatalog.com
  * @subject Neue Klasse MessagesException zur Anzeige verwenden
+ *
+ * @changed 10.12.00 gears@apache.org
+ * @subject Unicode
  */
 public class UserMessage {
 
@@ -159,7 +162,7 @@ public class UserMessage {
       case WARNING   : title = "Warning"; currentIconName = "warn.gif"; break;
       case QUESTION  : title = "Question"; currentIconName = "quest.gif"; break;
       case ERROR     : title = "Error"; currentIconName = "error.gif"; break;
-      default : title =  "Ung\uFFFCltiger IonType f\uFFFCr diese Meldung. Pr\uFFFCfen in \uFFDCbersetzungsdatei.";
+      default : title =  "Ung\u00FCltiger IonType f\u00FCr diese Meldung. Pr\u00FCfen in \u00DCbersetzungsdatei.";
     }
     return title;
   }
@@ -261,7 +264,7 @@ public class UserMessage {
     else {
       if (optionTypeIndex == STYLE_NOBUTTON) {
         // Wird nicht mehr unterstützt
-        MessageHandler.logln("UserMessage: STYLE_NOBUTTON wird nicht unterst\uFFFCtzt");
+        MessageHandler.logln("UserMessage: STYLE_NOBUTTON wird nicht unterst\u00FCtzt");
         return result;
       }
       else {