Changeset 8919 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2015-10-20T16:49:10+02:00 (9 years ago)

Author:

Don-vip

Message:

move UserCancelException class in tools package and use it where applicable

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• CombineWayAction.java (modified) (2 diffs)
• JoinAreasAction.java (modified) (2 diffs)
• MergeNodesAction.java (modified) (2 diffs)
• ReverseWayAction.java (modified) (2 diffs)
• SessionSaveAsAction.java (modified) (6 diffs)

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

@@ -27 +27 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.corrector.ReverseWayTagCorrector;
-import org.openstreetmap.josm.corrector.UserCancelException;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -39 +38 @@
 import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.UserCancelException;
 
 /**

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

@@ -30 +30 @@
 import org.openstreetmap.josm.command.DeleteCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
-import org.openstreetmap.josm.corrector.UserCancelException;
 import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -46 +45 @@
 import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.UserCancelException;
 import org.openstreetmap.josm.tools.Utils;
 

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

@@ -24 +24 @@
 import org.openstreetmap.josm.command.DeleteCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
-import org.openstreetmap.josm.corrector.UserCancelException;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -40 +39 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.UserCancelException;
 
 /**

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

@@ -21 +21 @@
 import org.openstreetmap.josm.corrector.ReverseWayNoTagCorrector;
 import org.openstreetmap.josm.corrector.ReverseWayTagCorrector;
-import org.openstreetmap.josm.corrector.UserCancelException;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -27 +26 @@
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.UserCancelException;
 import org.openstreetmap.josm.tools.Utils;
 

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

@@ -41 +41 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.MultiMap;
+import org.openstreetmap.josm.tools.UserCancelException;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.WindowGeometry;
@@ -66 +67 @@
         try {
             saveSession();
-        } catch (CancelException ignore) {
+        } catch (UserCancelException ignore) {
             if (Main.isTraceEnabled()) {
                 Main.trace(ignore.getMessage());
@@ -74 +75 @@
 
     /**
-     * Denotes that the user has cancelled the save process.
+     * Attempts to save the session.
+     * @throws UserCancelException when the user has cancelled the save process.
      * @since 8913
      */
-    public static class CancelException extends Exception {
-    }
-
-    /**
-     * Attempts to save the session.
-     * @throws CancelException when the user has cancelled the save process.
-     * @since 8913
-     */
-    public void saveSession() throws CancelException {
+    public void saveSession() throws UserCancelException {
         if (!isEnabled()) {
             return;
@@ -93 +87 @@
         dlg.showDialog();
         if (dlg.getValue() != 1) {
-            throw new CancelException();
+            throw new UserCancelException();
         }
 
@@ -118 +112 @@
 
         if (fc == null) {
-            throw new CancelException();
+            throw new UserCancelException();
         }
 
@@ -142 +136 @@
             file = new File(file.getPath() + (zip ? ".joz" : ".jos"));
             if (!SaveActionBase.confirmOverwrite(file)) {
-                throw new CancelException();
+                throw new UserCancelException();
             }
         }