Ticket #7429: singleton.patch

src/org/openstreetmap/josm/actions/SaveAction.java

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 import java.awt.event.KeyEvent;
 import java.io.File;
@@ -19 +19 @@
  * @author imi
  */
 public class SaveAction extends SaveActionBase {
+    private static SaveAction instance = new SaveAction();
 
     /**
      * Construct the action with "Save" as label.
      * @param layer Save this layer.
      */
-    public SaveAction() {
+    private SaveAction() {
         super(tr("Save"), "save", tr("Save the current data."),
                 Shortcut.registerShortcut("system:save", tr("File: {0}", tr("Save")), KeyEvent.VK_S, Shortcut.CTRL));
         putValue("help", ht("/Action/Save"));
     }
 
+    public static SaveAction getInstance() {
+        return instance;
+    }
+
+
     @Override public File getFile(Layer layer) {
         File f = layer.getAssociatedFile();
         if(f != null && ! f.exists()) {

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

@@ -9 +9 @@
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
+
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 import javax.swing.filechooser.FileFilter;
@@ -32 +33 @@
 
     @Override
     public void actionPerformed(ActionEvent e) {
-        if (!isEnabled()) {
+        if (!isEnabled())
             return;
-        }
         boolean saved = doSave();
         if (saved) {
             addToFileOpenHistory();
@@ -59 +59 @@
         return doInternalSave(layer, file);
     }
 
-    public boolean doSave(Layer layer, File file) {
+    public static boolean doSave(Layer layer, File file) {
         if(!checkSaveConditions(layer))
             return false;
         return doInternalSave(layer, file);
     }
 
-    private boolean doInternalSave(Layer layer, File file) {
+    private static boolean doInternalSave(Layer layer, File file) {
         if (file == null)
             return false;
 
@@ -103 +103 @@
      * there is no conflict etc.)
      * @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;
         else if (layer instanceof OsmDataLayer)  {
@@ -152 +152 @@
      *
      * @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())
                 return false;

src/org/openstreetmap/josm/gui/MainMenu.java

@@ -119 +119 @@
     public final OpenFileAction openFile = new OpenFileAction();
     public final RecentlyOpenedFilesMenu recentlyOpened = new RecentlyOpenedFilesMenu();
     public final OpenLocationAction openLocation = new OpenLocationAction();
-    public final JosmAction save = new SaveAction();
+    public final JosmAction save = SaveAction.getInstance();
     public final JosmAction saveAs = new SaveAsAction();
     public JosmAction sessionLoad;
     public JosmAction sessionSaveAs;

src/org/openstreetmap/josm/gui/layer/Layer.java

@@ -365 +365 @@
         }
 
         public void actionPerformed(ActionEvent e) {
-            new SaveAction().doSave(layer);
+            SaveAction.getInstance().doSave(layer);
         }
     }
 

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

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

src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java

@@ -18 +18 @@
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.io.Writer;
+import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
-import java.net.MalformedURLException;
 import java.util.Collection;
 import java.util.Collections;
 
@@ -34 +34 @@
 import javax.swing.JTextField;
 import javax.swing.SwingConstants;
 
-import org.w3c.dom.Element;
-
 import org.openstreetmap.josm.actions.SaveAction;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -45 +43 @@
 import org.openstreetmap.josm.io.session.SessionWriter.ExportSupport;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.w3c.dom.Element;
 
 public class OsmDataSessionExporter implements SessionLayerExporter {
 
@@ -74 +73 @@
         }
 
         public void actionPerformed(ActionEvent e) {
-            new SaveAction().doSave(layer);
+            SaveAction.getInstance().doSave(layer);
             updateEnabledState();
         }