Changeset 6671 in josm

Timestamp:

2014-01-11T20:25:43+01:00 (11 years ago)

Author:

simon04

Message:

fix #9560 - IllegalArgumentException when color.layer contains "{ }"

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/Preferences.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/data/PreferencesTest.groovy (added)
• test/unit/org/openstreetmap/josm/tools/I18nTest.groovy (added)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -53 +53 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ColorHelper;
+import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -836 +837 @@
             Matcher m = Pattern.compile("mappaint\\.(.+?)\\.(.+)").matcher(o);
             if (m.matches()) {
-                return tr("Paint style {0}: {1}", tr(m.group(1)), tr(m.group(2)));
+                return tr("Paint style {0}: {1}", tr(I18n.escape(m.group(1))), tr(I18n.escape(m.group(2))));
             }
         } catch (Exception e) {
@@ -844 +845 @@
             Matcher m = Pattern.compile("layer (.+)").matcher(o);
             if (m.matches()) {
-                return tr("Layer: {0}", tr(m.group(1)));
+                return tr("Layer: {0}", tr(I18n.escape(m.group(1))));
             }
         } catch (Exception e) {
             Main.warn(e);
         }
-        return tr(colornames.containsKey(o) ? colornames.get(o) : o);
+        return tr(I18n.escape(colornames.containsKey(o) ? colornames.get(o) : o));
     }