Index: trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java (revision 11847) +++ trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java (revision 11848) @@ -22,4 +22,5 @@ import org.openstreetmap.josm.tools.GBC; import org.openstreetmap.josm.tools.Shortcut; +import org.openstreetmap.josm.tools.Utils; public abstract class AbstractMergeAction extends JosmAction { @@ -100,5 +101,6 @@ protected void warnNoTargetLayersForSourceLayer(Layer sourceLayer) { JOptionPane.showMessageDialog(Main.parent, - tr("There are no layers the source layer
''{0}''
could be merged to.", sourceLayer.getName()), + tr("There are no layers the source layer
''{0}''
could be merged to.", + Utils.escapeReservedCharactersHTML(sourceLayer.getName())), tr("No target layers"), JOptionPane.WARNING_MESSAGE); } Index: trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java (revision 11847) +++ trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java (revision 11848) @@ -130,5 +130,8 @@ "This is not the recommended way of merging such data.
"+ "You should instead check and merge each object, one by one, by using ''Merge selection''.

"+ - "Are you sure you want to continue?", sourceLayer.getName(), targetLayer.getName(), targetLayer.getName())+ + "Are you sure you want to continue?", + Utils.escapeReservedCharactersHTML(sourceLayer.getName()), + Utils.escapeReservedCharactersHTML(targetLayer.getName()), + Utils.escapeReservedCharactersHTML(targetLayer.getName()))+ "", ImageProvider.get("dialogs", "mergedown"), tr("Ignore this hint and merge anyway")); Index: trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java (revision 11847) +++ trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java (revision 11848) @@ -18,4 +18,5 @@ import org.openstreetmap.josm.tools.ImageProvider; import org.openstreetmap.josm.tools.Shortcut; +import org.openstreetmap.josm.tools.Utils; /** @@ -90,5 +91,7 @@ "You should instead check and merge each object, one by one.

"+ "Are you sure you want to continue?", - getLayerManager().getEditLayer().getName(), targetLayer.getName(), targetLayer.getName())+ + Utils.escapeReservedCharactersHTML(getLayerManager().getEditLayer().getName()), + Utils.escapeReservedCharactersHTML(targetLayer.getName()), + Utils.escapeReservedCharactersHTML(targetLayer.getName()))+ "", ImageProvider.get("dialogs", "mergedown"), tr("Ignore this hint and merge anyway")); Index: trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 11847) +++ trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 11848) @@ -39,4 +39,5 @@ import org.openstreetmap.josm.tools.MultiMap; import org.openstreetmap.josm.tools.Shortcut; +import org.openstreetmap.josm.tools.Utils; import org.xml.sax.SAXException; @@ -182,5 +183,5 @@ files.size(), files.size(), - importer.filter.getDescription() + Utils.escapeReservedCharactersHTML(importer.filter.getDescription()) ) ).append("

strongly discouraged

"+ name + "*

{0}

{0}

").append(tr("Changeset comment:")).append("

" + - tr("The layer {0} does not support the new projection {1}.", getName(), newValue.toCode()) + "

" + tr("Supported projections are: {0}", nameSupportedProjections()) + "

" + tr("The layer {0} does not support the new projection {1}.", getName(), newValue.toCode()) + + "

" + tr("The layer {0} does not support the new projection {1}.", + Utils.escapeReservedCharactersHTML(getName()), newValue.toCode()) + "

" + tr("Supported projections are: {0}", nameSupportedProjections()) + "

"); if (entry.title != null) { - s.append(entry.title).append("

"); + s.append(Utils.escapeReservedCharactersHTML(entry.title)).append(" "); } s.append(entry.url); Index: trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (revision 11847) +++ trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (revision 11848) @@ -35,4 +35,5 @@ import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetReader; import org.openstreetmap.josm.tools.GBC; +import org.openstreetmap.josm.tools.Utils; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; @@ -89,9 +90,9 @@ errorMessage = tr("Tagging preset source {0} can be loaded but it contains errors. " + "Do you really want to use it?

Error is: [{1}:{2}] {3}

", - source, e.getLineNumber(), e.getColumnNumber(), e.getMessage()); + source, e.getLineNumber(), e.getColumnNumber(), Utils.escapeReservedCharactersHTML(e.getMessage())); } else { errorMessage = tr("Unable to parse tagging preset source: {0}. " + "Do you really want to use it?

Error is: [{1}:{2}] {3}

", - source, e.getLineNumber(), e.getColumnNumber(), e.getMessage()); + source, e.getLineNumber(), e.getColumnNumber(), Utils.escapeReservedCharactersHTML(e.getMessage())); } Main.warn(e, errorMessage); @@ -100,9 +101,9 @@ errorMessage = tr("Tagging preset source {0} can be loaded but it contains errors. " + "Do you really want to use it?

Error is: {1}

", - source, e.getMessage()); + source, Utils.escapeReservedCharactersHTML(e.getMessage())); } else { errorMessage = tr("Unable to parse tagging preset source: {0}. " + "Do you really want to use it?

Error is: {1}

", - source, e.getMessage()); + source, Utils.escapeReservedCharactersHTML(e.getMessage())); } Main.warn(e, errorMessage); Index: trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginCheckBox.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginCheckBox.java (revision 11847) +++ trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginCheckBox.java (revision 11848) @@ -88,5 +88,5 @@ "Plugin {0} is still required by these {1} plugins:", otherPlugins.size(), - plugin, + Utils.escapeReservedCharactersHTML(plugin), otherPlugins.size())) .append(Utils.joinAsHtmlUnorderedList(otherPlugins)) Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java (revision 11847) +++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java (revision 11848) @@ -43,4 +43,5 @@ import org.openstreetmap.josm.io.CachedFile; import org.openstreetmap.josm.io.UTFInputStreamReader; +import org.openstreetmap.josm.tools.Utils; import org.openstreetmap.josm.tools.XmlObjectParser; import org.xml.sax.SAXException; @@ -377,5 +378,6 @@ JOptionPane.showMessageDialog( Main.parent, - "" + tr("Error parsing {0}: ", source) + "

" + e.getMessage() + "

", + "" + tr("Error parsing {0}: ", source) + "

" + + Utils.escapeReservedCharactersHTML(e.getMessage()) + "

", tr("Error"), JOptionPane.ERROR_MESSAGE Index: trunk/src/org/openstreetmap/josm/io/FileImporter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/FileImporter.java (revision 11847) +++ trunk/src/org/openstreetmap/josm/io/FileImporter.java (revision 11848) @@ -16,4 +16,5 @@ import org.openstreetmap.josm.gui.progress.ProgressMonitor; import org.openstreetmap.josm.gui.util.GuiHelper; +import org.openstreetmap.josm.tools.Utils; /** @@ -108,5 +109,6 @@ HelpAwareOptionPane.showMessageDialogInEDT( Main.parent, - tr("Could not read file ''{0}''.
Error is:
{1}", f.getName(), e.getMessage()), + tr("Could not read file ''{0}''.
Error is:
{1}", + f.getName(), Utils.escapeReservedCharactersHTML(e.getMessage())), tr("Error"), JOptionPane.ERROR_MESSAGE, null @@ -138,5 +140,5 @@ HelpAwareOptionPane.showMessageDialogInEDT( Main.parent, - tr("Could not read files.
Error is:
{0}", e.getMessage()), + tr("Could not read files.
Error is:
{0}", Utils.escapeReservedCharactersHTML(e.getMessage())), tr("Error"), JOptionPane.ERROR_MESSAGE, null Index: trunk/src/org/openstreetmap/josm/io/OsmExporter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmExporter.java (revision 11847) +++ trunk/src/org/openstreetmap/josm/io/OsmExporter.java (revision 11848) @@ -94,5 +94,6 @@ JOptionPane.showMessageDialog( Main.parent, - tr("An error occurred while saving.
Error is:
{0}", e.getMessage()), + tr("An error occurred while saving.
Error is:
{0}", + Utils.escapeReservedCharactersHTML(e.getMessage())), tr("Error"), JOptionPane.ERROR_MESSAGE @@ -108,5 +109,6 @@ JOptionPane.showMessageDialog( Main.parent, - tr("An error occurred while restoring backup file.
Error is:
{0}", e2.getMessage()), + tr("An error occurred while restoring backup file.
Error is:
{0}", + Utils.escapeReservedCharactersHTML(e2.getMessage())), tr("Error"), JOptionPane.ERROR_MESSAGE Index: trunk/src/org/openstreetmap/josm/io/session/SessionReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/session/SessionReader.java (revision 11847) +++ trunk/src/org/openstreetmap/josm/io/session/SessionReader.java (revision 11848) @@ -507,5 +507,7 @@ dialog.show( tr("Error loading layer"), - tr("Could not load layer {0} ''{1}''.
Error is:
{2}", idx, name, exception.getMessage()), + tr("Could not load layer {0} ''{1}''.
Error is:
{2}", idx, + Utils.escapeReservedCharactersHTML(name), + Utils.escapeReservedCharactersHTML(exception.getMessage())), JOptionPane.ERROR_MESSAGE, progressMonitor Index: trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 11847) +++ trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 11848) @@ -350,5 +350,6 @@ String msg = tr("Loading of the plugin \"{0}\" was requested." + "
This plugin is no longer developed and very likely will produce errors." - +"
It should be disabled.
Delete from preferences?", unmaintained); + +"
It should be disabled.
Delete from preferences?", + Utils.escapeReservedCharactersHTML(unmaintained)); if (confirmDisablePlugin(parent, msg, unmaintained)) { Main.pref.removeFromCollection("plugins", unmaintained); @@ -506,5 +507,5 @@ "Plugin {0} requires {1} plugins which were not found. The missing plugins are:", missingRequiredPlugin.size(), - plugin, + Utils.escapeReservedCharactersHTML(plugin), missingRequiredPlugin.size())) .append(Utils.joinAsHtmlUnorderedList(missingRequiredPlugin)) @@ -723,5 +724,5 @@ if (e.getCause() instanceof ClassNotFoundException) { msg = tr("Could not load plugin {0} because the plugin
main class ''{1}'' was not found.
" - + "Delete from preferences?", plugin.name, plugin.className); + + "Delete from preferences?", Utils.escapeReservedCharactersHTML(plugin.name), plugin.className); } } catch (RuntimeException e) { // NOPMD @@ -919,5 +920,5 @@ .append("

").append(pi.name).append("
").append(Utils.escapeReservedCharactersHTML(pi.name)).append("

") @@ -1270,8 +1271,10 @@ final StringBuilder msg = new StringBuilder(256); msg.append("") - .append(tr("An unexpected exception occurred that may have come from the ''{0}'' plugin.", plugin.getPluginInformation().name)) + .append(tr("An unexpected exception occurred that may have come from the ''{0}'' plugin.", + Utils.escapeReservedCharactersHTML(plugin.getPluginInformation().name))) .append("
"); if (plugin.getPluginInformation().author != null) { - msg.append(tr("According to the information within the plugin, the author is {0}.", plugin.getPluginInformation().author)) + msg.append(tr("According to the information within the plugin, the author is {0}.", + Utils.escapeReservedCharactersHTML(plugin.getPluginInformation().author))) .append("
"); } Index: trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java =================================================================== --- trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 11847) +++ trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 11848) @@ -298,5 +298,5 @@ StringBuilder sb = new StringBuilder(128); sb.append("") - .append(description == null ? tr("no description available") : description); + .append(description == null ? tr("no description available") : Utils.escapeReservedCharactersHTML(description)); if (link != null) { sb.append(" ").append(tr("More info...")).append("");