Changeset 5014 in josm for trunk

Timestamp:

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

Author:

xeen

Message:

fix #7429

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SaveAction.java (modified) (3 diffs)
• actions/SaveActionBase.java (modified) (6 diffs)
• gui/MainMenu.java (modified) (1 diff)
• gui/io/SaveLayerTask.java (modified) (1 diff)
• gui/io/SaveLayersDialog.java (modified) (4 diffs)
• gui/layer/Layer.java (modified) (1 diff)
• io/session/OsmDataSessionExporter.java (modified) (4 diffs)

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

@@ -2 +2 @@
 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;
@@ -20 +20 @@
  */
 public class SaveAction extends SaveActionBase {
+    private static SaveAction instance = new SaveAction();
 
     /**
@@ -25 +26 @@
      * @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) {

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())

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

@@ -120 +120 @@
     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;

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

@@ -48 +48 @@
         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;

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

@@ -29 +29 @@
 import javax.swing.ImageIcon;
 import javax.swing.JComponent;
+import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
@@ -44 +45 @@
 import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.gui.ExceptionDialogUtil;
-import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.io.SaveLayersModel.Mode;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -94 +94 @@
     }
 
-    private SideButton saveAndProceedActionButton = null;
+    private JButton saveAndProceedActionButton = null;
 
     /**
@@ -107 +107 @@
         saveAndProceedAction = new SaveAndProceedAction();
         model.addPropertyChangeListener(saveAndProceedAction);
-        pnl.add(saveAndProceedActionButton = new SideButton(saveAndProceedAction));
+        pnl.add(saveAndProceedActionButton = new JButton(saveAndProceedAction));
 
         discardAndProceedAction = new DiscardAndProceedAction();
         model.addPropertyChangeListener(discardAndProceedAction);
-        pnl.add(new SideButton(discardAndProceedAction));
+        pnl.add(new JButton(discardAndProceedAction));
 
         cancelAction = new CancelAction();
-        pnl.add(new SideButton(cancelAction));
+        pnl.add(new JButton(cancelAction));
 
         JPanel pnl2 = new JPanel();

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

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

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

@@ -19 +19 @@
 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;
@@ -35 +35 @@
 import javax.swing.SwingConstants;
 
-import org.w3c.dom.Element;
-
 import org.openstreetmap.josm.actions.SaveAction;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -46 +44 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.w3c.dom.Element;
 
 public class OsmDataSessionExporter implements SessionLayerExporter {
@@ -75 +74 @@
 
         public void actionPerformed(ActionEvent e) {
-            new SaveAction().doSave(layer);
+            SaveAction.getInstance().doSave(layer);
             updateEnabledState();
         }