- Timestamp:
- 2017-11-12T02:32:10+01:00 (6 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java
r12894 r13115 21 21 import org.openstreetmap.josm.gui.layer.Layer; 22 22 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 23 import org.openstreetmap.josm.gui.util.GuiHelper; 23 24 import org.openstreetmap.josm.gui.widgets.AbstractFileChooser; 24 25 import org.openstreetmap.josm.spi.preferences.Config; … … 105 106 } 106 107 if (!exported) { 107 JOptionPane.showMessageDialog(Main.parent, tr("No Exporter found! Nothing saved."), tr("Warning"), 108 JOptionPane.WARNING_MESSAGE); 108 GuiHelper.runInEDTAndWait(() -> 109 JOptionPane.showMessageDialog(Main.parent, tr("No Exporter found! Nothing saved."), tr("Warning"), 110 JOptionPane.WARNING_MESSAGE)); 109 111 return false; 110 112 } else if (canceled) { -
trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java
r12537 r13115 26 26 27 27 import org.openstreetmap.josm.actions.SaveActionBase; 28 import org.openstreetmap.josm.gui.layer.NoteLayer; 28 29 import org.openstreetmap.josm.gui.util.CellEditorSupport; 29 30 import org.openstreetmap.josm.gui.widgets.JosmTextField; … … 49 50 50 51 private final transient CellEditorSupport cellEditorSupport = new CellEditorSupport(this); 52 private String extension = "osm"; 51 53 private File value; 52 54 … … 90 92 .append(addLblLayerName(info)); 91 93 if (info.isSavable()) { 94 extension = info.getLayer() instanceof NoteLayer ? "osn" : "osm"; 92 95 add(btnFileChooser, GBC.std()); 93 96 sb.append("<br>") … … 111 114 112 115 if (info.isSavable()) { 116 extension = info.getLayer() instanceof NoteLayer ? "osn" : "osm"; 113 117 add(btnFileChooser, GBC.std()); 114 118 add(tfFilename, GBC.eol().fill(GBC.HORIZONTAL).insets(1, 0, 0, 0)); … … 242 246 @Override 243 247 public void actionPerformed(ActionEvent e) { 244 File f = SaveActionBase.createAndOpenSaveFileChooser(tr("Select filename"), "osm");248 File f = SaveActionBase.createAndOpenSaveFileChooser(tr("Select filename"), extension); 245 249 if (f != null) { 246 250 tfFilename.setText(f.toString());
Note:
See TracChangeset
for help on using the changeset viewer.