Changeset 11848 in josm for trunk/src/org/openstreetmap/josm/actions
- Timestamp:
- 2017-04-07T00:18:07+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/actions
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
r11017 r11848 22 22 import org.openstreetmap.josm.tools.GBC; 23 23 import org.openstreetmap.josm.tools.Shortcut; 24 import org.openstreetmap.josm.tools.Utils; 24 25 25 26 public abstract class AbstractMergeAction extends JosmAction { … … 100 101 protected void warnNoTargetLayersForSourceLayer(Layer sourceLayer) { 101 102 JOptionPane.showMessageDialog(Main.parent, 102 tr("<html>There are no layers the source layer<br>''{0}''<br>could be merged to.</html>", sourceLayer.getName()), 103 tr("<html>There are no layers the source layer<br>''{0}''<br>could be merged to.</html>", 104 Utils.escapeReservedCharactersHTML(sourceLayer.getName())), 103 105 tr("No target layers"), JOptionPane.WARNING_MESSAGE); 104 106 } -
trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java
r11739 r11848 130 130 "<b>This is not the recommended way of merging such data</b>.<br />"+ 131 131 "You should instead check and merge each object, one by one, by using ''<i>Merge selection</i>''.<br /><br />"+ 132 "Are you sure you want to continue?", sourceLayer.getName(), targetLayer.getName(), targetLayer.getName())+ 132 "Are you sure you want to continue?", 133 Utils.escapeReservedCharactersHTML(sourceLayer.getName()), 134 Utils.escapeReservedCharactersHTML(targetLayer.getName()), 135 Utils.escapeReservedCharactersHTML(targetLayer.getName()))+ 133 136 "</html>", 134 137 ImageProvider.get("dialogs", "mergedown"), tr("Ignore this hint and merge anyway")); -
trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java
r10552 r11848 18 18 import org.openstreetmap.josm.tools.ImageProvider; 19 19 import org.openstreetmap.josm.tools.Shortcut; 20 import org.openstreetmap.josm.tools.Utils; 20 21 21 22 /** … … 90 91 "You should instead check and merge each object, <b>one by one</b>.<br /><br />"+ 91 92 "Are you sure you want to continue?", 92 getLayerManager().getEditLayer().getName(), targetLayer.getName(), targetLayer.getName())+ 93 Utils.escapeReservedCharactersHTML(getLayerManager().getEditLayer().getName()), 94 Utils.escapeReservedCharactersHTML(targetLayer.getName()), 95 Utils.escapeReservedCharactersHTML(targetLayer.getName()))+ 93 96 "</html>", 94 97 ImageProvider.get("dialogs", "mergedown"), tr("Ignore this hint and merge anyway")); -
trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java
r10601 r11848 39 39 import org.openstreetmap.josm.tools.MultiMap; 40 40 import org.openstreetmap.josm.tools.Shortcut; 41 import org.openstreetmap.josm.tools.Utils; 41 42 import org.xml.sax.SAXException; 42 43 … … 182 183 files.size(), 183 184 files.size(), 184 importer.filter.getDescription()185 Utils.escapeReservedCharactersHTML(importer.filter.getDescription()) 185 186 ) 186 187 ).append("<br><ul>"); -
trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.java
r11746 r11848 190 190 Main.parent, 191 191 tr("<html>Could not load session file ''{0}''.<br>Error is:<br>{1}</html>", 192 uri != null ? uri : file.getName(), e.getMessage()),192 uri != null ? uri : file.getName(), Utils.escapeReservedCharactersHTML(e.getMessage())), 193 193 dialogTitle, 194 194 JOptionPane.ERROR_MESSAGE, -
trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java
r11109 r11848 170 170 HelpAwareOptionPane.showMessageDialogInEDT( 171 171 Main.parent, 172 tr("<html>Could not save session file ''{0}''.<br>Error is:<br>{1}</html>", file.getName(), ex.getMessage()), 172 tr("<html>Could not save session file ''{0}''.<br>Error is:<br>{1}</html>", 173 file.getName(), Utils.escapeReservedCharactersHTML(ex.getMessage())), 173 174 tr("IO Error"), 174 175 JOptionPane.ERROR_MESSAGE, -
trunk/src/org/openstreetmap/josm/actions/UploadAction.java
r11709 r11848 29 29 import org.openstreetmap.josm.tools.ImageProvider; 30 30 import org.openstreetmap.josm.tools.Shortcut; 31 import org.openstreetmap.josm.tools.Utils; 31 32 32 33 /** … … 154 155 Main.parent, 155 156 tr("<html>The data to be uploaded participates in unresolved conflicts of layer ''{0}''.<br>" 156 + "You have to resolve them first.</html>", layer.getName()157 + "You have to resolve them first.</html>", Utils.escapeReservedCharactersHTML(layer.getName()) 157 158 ), 158 159 tr("Warning"), … … 173 174 "Sending data from this layer is <b>strongly discouraged</b>. If you continue,<br />"+ 174 175 "it may require you subsequently have to revert your changes, or force other contributors to.<br /><br />"+ 175 "Are you sure you want to continue?", layer.getName())+176 "Are you sure you want to continue?", Utils.escapeReservedCharactersHTML(layer.getName()))+ 176 177 "</html>", 177 178 ImageProvider.get("upload"), tr("Ignore this hint and upload anyway"));
Note:
See TracChangeset
for help on using the changeset viewer.