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

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/gui

Files:

• conflict/tags/CombinePrimitiveResolverDialog.java (modified) (2 diffs)
• io/SaveLayersDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

@@ -34 +34 @@
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.command.Command;
-import org.openstreetmap.josm.corrector.UserCancelException;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -48 +47 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.UserCancelException;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.Utils.Function;

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

@@ -52 +52 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.UserCancelException;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.WindowGeometry;
@@ -375 +376 @@
                 setUserAction(UserAction.PROCEED);
                 closeDialog();
-            } catch (CancelException ignore) {
+            } catch (UserCancelException ignore) {
                 if (Main.isTraceEnabled()) {
                     Main.trace(ignore.getMessage());