Changeset 4170 in josm

Timestamp:

Jun 25, 2011 11:25:43 PM (2 years ago)

Author:

stoecker

Message:

fix #6057 - single quotes in presets impossible

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -279 +279 @@
                 if (text != null) {
                     if(text_context != null) {
-                        locale_text = trc(text_context, text);
+                        locale_text = trc(text_context, text.replaceAll("'","''"));
                     } else {
-                        locale_text = tr(text);
+                        locale_text = tr(text.replaceAll("'","''"));
                     }
                 }
@@ -334 +334 @@
             if(locale_text == null) {
                 if(text_context != null) {
-                    locale_text = trc(text_context, text);
+                    locale_text = trc(text_context, text.replaceAll("'","''"));
                 } else {
-                    locale_text = tr(text);
+                    locale_text = tr(text.replaceAll("'","''"));
                 }
             }
@@ -467 +467 @@
                 PresetListEntry e = new PresetListEntry(value_array[i]);
                 e.display_value = (locale_display_values == null)
-                ? (values_context == null ? tr(display_array[i])
-                        : trc(values_context, display_array[i])) : display_array[i];
+                ? (values_context == null ? tr(display_array[i].replaceAll("'","''"))
+                        : trc(values_context, display_array[i].replaceAll("'","''"))) : display_array[i];
                 if (short_descriptions_array != null) {
-                    e.short_description = locale_short_descriptions == null ? tr(short_descriptions_array[i])
-                            : short_descriptions_array[i];
+                    e.short_description = locale_short_descriptions == null ? tr(short_descriptions_array[i].replaceAll("'","''"))
+                            : short_descriptions_array[i].replaceAll("'","''");
                 }
                 lhm.put(value_array[i], e);
@@ -524 +524 @@
             if(locale_text == null) {
                 if(text_context != null) {
-                    locale_text = trc(text_context, text);
+                    locale_text = trc(text_context, text.replaceAll("'","''"));
                 } else {
-                    locale_text = tr(text);
+                    locale_text = tr(text.replaceAll("'","''"));
                 }
             }
@@ -743 +743 @@
                 PresetListEntry e = new PresetListEntry(value_array[i]);
                 e.display_value = (locale_display_values == null)
-                ? (values_context == null ? tr(display_array[i])
-                        : trc(values_context, display_array[i])) : display_array[i];
+                ? (values_context == null ? tr(display_array[i].replaceAll("'","''"))
+                        : trc(values_context, display_array[i].replaceAll("'","''"))) : display_array[i];
                 if (short_descriptions_array != null) {
-                    e.short_description = locale_short_descriptions == null ? tr(short_descriptions_array[i])
+                    e.short_description = locale_short_descriptions == null ? tr(short_descriptions_array[i].replaceAll("'","''"))
                             : short_descriptions_array[i];
                 }
@@ -772 +772 @@
             if (locale_text == null) {
                 if(text_context != null) {
-                    locale_text = trc(text_context, text);
+                    locale_text = trc(text_context, text.replaceAll("'","''"));
                 } else {
-                    locale_text = tr(text);
+                    locale_text = tr(text.replaceAll("'","''"));
                 }
             }
@@ -914 +914 @@
             if(locale_text == null) {
                 if(text_context != null) {
-                    locale_text = trc(text_context, text);
+                    locale_text = trc(text_context, text.replaceAll("'","''"));
                 } else {
-                    locale_text = tr(text);
+                    locale_text = tr(text.replaceAll("'","''"));
                 }
             }
@@ -937 +937 @@
                     locale_text = tr("More information about this feature");
                 } else if(text_context != null) {
-                    locale_text = trc(text_context, text);
+                    locale_text = trc(text_context, text.replaceAll("'","''"));
                 } else {
-                    locale_text = tr(text);
+                    locale_text = tr(text.replaceAll("'","''"));
                 }
             }
@@ -1002 +1002 @@
                 if (text != null) {
                     if(text_context != null) {
-                        locale_text = trc(text_context, text);
+                        locale_text = trc(text_context, text.replaceAll("'","''"));
                     } else {
-                        locale_text = tr(text);
+                        locale_text = tr(text.replaceAll("'","''"));
                     }
                 }
@@ -1103 +1103 @@
         if(locale_name == null) {
             if(name_context != null) {
-                locale_name = trc(name_context, name);
+                locale_name = trc(name_context, name.replaceAll("'","''"));
             } else {
-                locale_name = tr(name);
+                locale_name = tr(name.replaceAll("'","''"));
             }
         }