Index: trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java	(revision 18705)
+++ trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java	(revision 18706)
@@ -82,5 +82,8 @@
     }
 
-    private enum UserAction {
+    /**
+     * The action a user decided to take with respect to an operation
+     */
+    enum UserAction {
         /** save/upload layers was successful, proceed with operation */
         PROCEED,
@@ -113,5 +116,5 @@
         if (!GraphicsEnvironment.isHeadless()) {
             SaveLayersDialog dialog = new SaveLayersDialog(MainApplication.getMainFrame());
-            List<AbstractModifiableLayer> layersWithUnmodifiedChanges = new ArrayList<>();
+            List<AbstractModifiableLayer> layersWithUnsavedChanges = new ArrayList<>();
             for (Layer l: selectedLayers) {
                 if (!(l instanceof AbstractModifiableLayer)) {
@@ -122,11 +125,11 @@
                         ((!odl.isSavable() && !odl.isUploadable()) ||
                                 odl.requiresSaveToFile() ||
-                                (odl.requiresUploadToServer() && !odl.isUploadDiscouraged()))) {
-                    layersWithUnmodifiedChanges.add(odl);
+                                odl.requiresUploadToServer())) {
+                    layersWithUnsavedChanges.add(odl);
                 }
             }
             dialog.prepareForSavingAndUpdatingLayers(reason);
-            if (!layersWithUnmodifiedChanges.isEmpty()) {
-                dialog.getModel().populate(layersWithUnmodifiedChanges);
+            if (!layersWithUnsavedChanges.isEmpty()) {
+                dialog.getModel().populate(layersWithUnsavedChanges);
                 dialog.setVisible(true);
                 switch(dialog.getUserAction()) {