Changeset 11101 in josm for trunk

Timestamp:

2016-10-08T03:22:40+02:00 (8 years ago)

Author:

Don-vip

Message:

add more unit tests

Location:

trunk

Files:

• .classpath (modified) (1 diff)
• src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (modified) (1 diff)
• test/lib/system-rules-1.16.0.jar (added)
• test/unit/org/openstreetmap/josm/actions/DeleteLayerActionTest.java (added)
• test/unit/org/openstreetmap/josm/actions/ExitActionTest.java (added)

trunk/.classpath

@@ -19 +19 @@
         <classpathentry kind="lib" path="test/lib/reflections/guava-19.0.jar"/>
         <classpathentry kind="lib" path="test/lib/reflections/javassist-3.20.0-GA.jar"/>
+        <classpathentry kind="lib" path="test/lib/system-rules-1.16.0.jar"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_102"/>
         <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>

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

@@ -102 +102 @@
      */
     public static boolean saveUnsavedModifications(Iterable<? extends Layer> selectedLayers, Reason reason) {
-        SaveLayersDialog dialog = new SaveLayersDialog(Main.parent);
-        List<AbstractModifiableLayer> layersWithUnmodifiedChanges = new ArrayList<>();
-        for (Layer l: selectedLayers) {
-            if (!(l instanceof AbstractModifiableLayer)) {
-                continue;
-            }
-            AbstractModifiableLayer odl = (AbstractModifiableLayer) l;
-            if (odl.isModified() &&
-                    ((!odl.isSavable() && !odl.isUploadable()) ||
-                            odl.requiresSaveToFile() ||
-                            (odl.requiresUploadToServer() && !odl.isUploadDiscouraged()))) {
-                layersWithUnmodifiedChanges.add(odl);
-            }
-        }
-        dialog.prepareForSavingAndUpdatingLayers(reason);
-        if (!layersWithUnmodifiedChanges.isEmpty()) {
-            dialog.getModel().populate(layersWithUnmodifiedChanges);
-            dialog.setVisible(true);
-            switch(dialog.getUserAction()) {
-                case PROCEED: return true;
-                case CANCEL:
-                default: return false;
+        if (!GraphicsEnvironment.isHeadless()) {
+            SaveLayersDialog dialog = new SaveLayersDialog(Main.parent);
+            List<AbstractModifiableLayer> layersWithUnmodifiedChanges = new ArrayList<>();
+            for (Layer l: selectedLayers) {
+                if (!(l instanceof AbstractModifiableLayer)) {
+                    continue;
+                }
+                AbstractModifiableLayer odl = (AbstractModifiableLayer) l;
+                if (odl.isModified() &&
+                        ((!odl.isSavable() && !odl.isUploadable()) ||
+                                odl.requiresSaveToFile() ||
+                                (odl.requiresUploadToServer() && !odl.isUploadDiscouraged()))) {
+                    layersWithUnmodifiedChanges.add(odl);
+                }
+            }
+            dialog.prepareForSavingAndUpdatingLayers(reason);
+            if (!layersWithUnmodifiedChanges.isEmpty()) {
+                dialog.getModel().populate(layersWithUnmodifiedChanges);
+                dialog.setVisible(true);
+                switch(dialog.getUserAction()) {
+                    case PROCEED: return true;
+                    case CANCEL:
+                    default: return false;
+                }
             }
         }