Changeset 4114 in josm for trunk/src/org/openstreetmap/josm/gui/io

Timestamp:

2011-06-01T22:23:11+02:00 (13 years ago)

Author:

stoecker

Message:

setting a save file in the close layer dialog now works as expected

Location:

trunk/src/org/openstreetmap/josm/gui/io

Files:

• SaveLayerTask.java (modified) (1 diff)
• SaveLayersModel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java

@@ -48 +48 @@
         try {
             parentMonitor.subTask(tr("Saving layer to ''{0}'' ...", layerInfo.getFile().toString()));
-            layerInfo.getLayer().setAssociatedFile(layerInfo.getFile());
-            if (!new SaveAction().doSave(layerInfo.getLayer())) {
+            if (!new SaveAction().doSave(layerInfo.getLayer(), layerInfo.getFile())) {
                 setFailed(true);
                 return;

trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java

@@ -116 +116 @@
         List<SaveLayerInfo> ret =new ArrayList<SaveLayerInfo>();
         for (SaveLayerInfo info: layerInfo) {
-            if (info.isDoSaveToFile() && info.getFile() != null && ! info.getFile().canWrite()) {
+            if (info.isDoSaveToFile() && info.getFile() != null && info.getFile().exists() && !info.getFile().canWrite()) {
                 ret.add(info);
             }