Changeset 9215 in josm for trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java

Timestamp:

2015-12-29T21:01:48+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #12250 - Error when loading session containing layer converted from .gpx

File:

• trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java

@@ -49 +49 @@
 
     private final OsmDataLayer layer;
-    private JRadioButton link, include;
+    private JRadioButton link;
+    private JRadioButton include;
     private JCheckBox export;
 
+    /**
+     * Constructs a new {@code OsmDataSessionExporter}.
+     * @param layer Data layer to export
+     */
     public OsmDataSessionExporter(OsmDataLayer layer) {
         this.layer = layer;
@@ -62 +67 @@
 
     private class LayerSaveAction extends AbstractAction {
+        /**
+         * Constructs a new {@code LayerSaveAction}.
+         */
         LayerSaveAction() {
             putValue(SMALL_ICON, new ImageProvider("save").setWidth(16).get());
@@ -105 +113 @@
         final LayerSaveAction saveAction = new LayerSaveAction();
         final JButton save = new JButton(saveAction);
-        if (file != null) {
+        if (file != null && file.exists()) {
             JosmTextField tf = new JosmTextField();
             tf.setText(file.getPath());
@@ -126 +134 @@
         cards.add(cardInclude, "include");
 
-        if (file != null) {
+        if (file != null && file.exists()) {
             link.setSelected(true);
         } else {
@@ -166 +174 @@
                     GuiHelper.setEnabledRec(p, true);
                     save.setEnabled(saveAction.isEnabled());
-                    link.setEnabled(file != null);
+                    link.setEnabled(file != null && file.exists());
                 }
             }