Changeset 679 in josm for trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java

Timestamp:

2008-07-05T14:12:34+02:00 (18 years ago)

Author:

stoecker

Message:

finished XML based translations of presets fixes #960
correct bounding box illegal access fixes #1044
do no longer modify objects when unnessesary (can result in 0 objects
modified in Undo :-)
correct typo fixes #730
some I18N corrections

File:

• trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.tools;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.Reader;
@@ -28 +30 @@
 public class XmlObjectParser implements Iterable<Object> {
 
+        public static final String lang = tr("En:").toLowerCase();
         public static class Uniform<T> implements Iterable<T>{
                 private Iterator<Object> iterator;
@@ -104 +107 @@
                                 Field f = null;
                                 try {
-                        f = c.getClass().getField(fieldName);
-                } catch (NoSuchFieldException e) {
-                }
+                                        f = c.getClass().getField(fieldName);
+                                } catch (NoSuchFieldException e) {
+                                        if(fieldName.startsWith(lang))
+                                        {
+                                                String locfieldName = "locale_" +
+                                                fieldName.substring(lang.length());
+                                                try {
+                                                        f = c.getClass().getField(locfieldName);
+                                                } catch (NoSuchFieldException ex) {
+                                                }
+                                        }
+                                }
                                 if (f != null && Modifier.isPublic(f.getModifiers()))
                                         f.set(c, getValueForClass(f.getType(), value));
                                 else {
-                                        fieldName = "set" + fieldName.substring(0,1).toUpperCase() + fieldName.substring(1);
+                                        if(fieldName.startsWith(lang))
+                                        {
+                                                int l = lang.length();
+                                                fieldName = "set" + fieldName.substring(l,l+1).toUpperCase() + fieldName.substring(l+1);
+                                        }
+                                        else
+                                        {
+                                                fieldName = "set" + fieldName.substring(0,1).toUpperCase() + fieldName.substring(1);
+                                        }
                                         Method[] methods = c.getClass().getDeclaredMethods();
                                         for (Method m : methods) {