Changeset 5014 in josm for trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java

Timestamp:

2012-02-21T19:26:54+01:00 (12 years ago)

Author:

xeen

Message:

fix #7429

File:

• trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java

@@ -10 +10 @@
 import java.util.LinkedList;
 import java.util.List;
+
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
@@ -33 +34 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        if (!isEnabled()) {
-            return;
-        }
+        if (!isEnabled())
+            return;
         boolean saved = doSave();
         if (saved) {
@@ -60 +60 @@
     }
 
-    public boolean doSave(Layer layer, File file) {
+    public static boolean doSave(Layer layer, File file) {
         if(!checkSaveConditions(layer))
             return false;
@@ -66 +66 @@
     }
 
-    private boolean doInternalSave(Layer layer, File file) {
+    private static boolean doInternalSave(Layer layer, File file) {
         if (file == null)
             return false;
@@ -104 +104 @@
      * @return <code>true</code>, if it is safe to save.
      */
-    public boolean checkSaveConditions(Layer layer) {
+    public static boolean checkSaveConditions(Layer layer) {
         if (layer instanceof GpxLayer)
             return ((GpxLayer)layer).data != null;
@@ -153 +153 @@
      * @return <code>true</code>, if a save result in an empty data set.
      */
-    private boolean isDataSetEmpty(OsmDataLayer layer) {
+    private static boolean isDataSetEmpty(OsmDataLayer layer) {
         for (OsmPrimitive osm : layer.data.allNonDeletedPrimitives())
             if (!osm.isDeleted() || !osm.isNewOrUndeleted())