Changeset 11649 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2017-03-02T01:59:40+01:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
r11633 r11649 1055 1055 File file = getAssociatedFile(); 1056 1056 if (file == null && isRenamed()) { 1057 String filename = Main.pref.get("lastDirectory") + '/' + getName(); 1058 if (!OsmImporter.FILE_FILTER.acceptName(filename)) 1059 filename = filename + '.' + extension; 1060 file = new File(filename); 1057 StringBuilder filename = new StringBuilder(Main.pref.get("lastDirectory")).append('/').append(getName()); 1058 if (!OsmImporter.FILE_FILTER.acceptName(filename.toString())) { 1059 filename.append('.').append(extension); 1060 } 1061 file = new File(filename.toString()); 1061 1062 } 1062 1063 return new FileChooserManager() -
trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java
r11308 r11649 89 89 String incomingData = ex3.getIncomingData().trim(); 90 90 String title = tr("WMS Error"); 91 String message = tr("Could not parse WMS layer list.");91 StringBuilder message = new StringBuilder(tr("Could not parse WMS layer list.")); 92 92 Main.error(ex3, "Could not parse WMS layer list. Incoming data:\n"+incomingData); 93 93 if ((incomingData.startsWith("<html>") || incomingData.startsWith("<HTML>")) 94 94 && (incomingData.endsWith("</html>") || incomingData.endsWith("</HTML>"))) { 95 GuiHelper.notifyUserHtmlError(this, title, message , incomingData);95 GuiHelper.notifyUserHtmlError(this, title, message.toString(), incomingData); 96 96 } else { 97 97 if (ex3.getMessage() != null) { 98 message += '\n' + ex3.getMessage();98 message.append('\n').append(ex3.getMessage()); 99 99 } 100 JOptionPane.showMessageDialog(getParent(), message , title, JOptionPane.ERROR_MESSAGE);100 JOptionPane.showMessageDialog(getParent(), message.toString(), title, JOptionPane.ERROR_MESSAGE); 101 101 } 102 102 }
Note:
See TracChangeset
for help on using the changeset viewer.