Changeset 5519 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

Timestamp:

2012-09-30T17:36:39+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #8090 - Removing saved non-uploadable layer asks for confirmation

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -389 +389 @@
         }
 
-        protected boolean enforceUploadOrSaveModifiedData(List<Layer> selectedLayers) {
-            SaveLayersDialog dialog = new SaveLayersDialog(Main.parent);
-            List<OsmDataLayer> layersWithUnmodifiedChanges = new ArrayList<OsmDataLayer>();
-            for (Layer l: selectedLayers) {
-                if (! (l instanceof OsmDataLayer)) {
-                    continue;
-                }
-                OsmDataLayer odl = (OsmDataLayer)l;
-                if ((odl.requiresSaveToFile() || odl.requiresUploadToServer()) && odl.data.isModified()) {
-                    layersWithUnmodifiedChanges.add(odl);
-                }
-            }
-            dialog.prepareForSavingAndUpdatingLayersBeforeDelete();
-            if (!layersWithUnmodifiedChanges.isEmpty()) {
-                dialog.getModel().populate(layersWithUnmodifiedChanges);
-                dialog.setVisible(true);
-                switch(dialog.getUserAction()) {
-                case CANCEL: return false;
-                case PROCEED: return true;
-                default: return false;
-                }
-            }
-            return true;
-        }
-
         @Override
         public void actionPerformed(ActionEvent e) {
@@ -419 +394 @@
             if (selectedLayers.isEmpty())
                 return;
-            if (! enforceUploadOrSaveModifiedData(selectedLayers))
+            if (!Main.saveUnsavedModifications(selectedLayers, false))
                 return;
-            for(Layer l: selectedLayers) {
+            for (Layer l: selectedLayers) {
                 Main.main.removeLayer(l);
             }