Changeset 6130 in josm for trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

Timestamp:

2013-08-10T12:06:25+02:00 (13 years ago)

Author:

bastiK

Message:

see #6963 - converted popups to notifications for all actions in the Tools menu (TODO: Simplify Way)

File:

• trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (modified) (9 diffs)

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

@@ -42 +42 @@
 import org.openstreetmap.josm.data.osm.TagCollection;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;
 import org.openstreetmap.josm.tools.Geometry;
@@ -320 +321 @@
 
         if (ways.isEmpty()) {
-            JOptionPane.showMessageDialog(Main.parent, tr("Please select at least one closed way that should be joined."));
+            new Notification(
+                    tr("Please select at least one closed way that should be joined."))
+                    .setIcon(JOptionPane.INFORMATION_MESSAGE)
+                    .show();
             return;
         }
@@ -327 +331 @@
         for (Way way : ways) {
             if (!way.isClosed()) {
-                JOptionPane.showMessageDialog(Main.parent, tr("One of the selected ways is not closed and therefore cannot be joined."));
+                new Notification(
+                        tr("One of the selected ways is not closed and therefore cannot be joined."))
+                        .setIcon(JOptionPane.INFORMATION_MESSAGE)
+                        .show();
                 return;
             }
@@ -355 +362 @@
 
         if (!testJoin(areas)) {
-            JOptionPane.showMessageDialog(Main.parent, tr("No intersection found. Nothing was changed."));
+            new Notification(
+                    tr("No intersection found. Nothing was changed."))
+                    .setIcon(JOptionPane.INFORMATION_MESSAGE)
+                    .show();
             return;
         }
@@ -377 +387 @@
                 Main.map.mapView.repaint();
             } else {
-                JOptionPane.showMessageDialog(Main.parent, tr("No intersection found. Nothing was changed."));
+                new Notification(
+                        tr("No intersection found. Nothing was changed."))
+                        .setIcon(JOptionPane.INFORMATION_MESSAGE)
+                        .show();
             }
         }
@@ -518 +531 @@
 
         if (warnAboutRelations) {
-            JOptionPane.showMessageDialog(Main.parent, tr("Some of the ways were part of relations that have been modified. Please verify no errors have been introduced."));
+            new Notification(
+                    tr("Some of the ways were part of relations that have been modified.<br>Please verify no errors have been introduced."))
+                    .setIcon(JOptionPane.INFORMATION_MESSAGE)
+                    .setDuration(Notification.TIME_LONG)
+                    .show();
         }
 
@@ -1212 +1229 @@
 
             if (outerWays.size() > 1) {
-                JOptionPane.showMessageDialog(Main.parent, tr("Sorry. Cannot handle multipolygon relations with multiple outer ways."));
+                new Notification(
+                        tr("Sorry. Cannot handle multipolygon relations with multiple outer ways."))
+                        .setIcon(JOptionPane.INFORMATION_MESSAGE)
+                        .show();
                 return null;
             }
@@ -1222 +1242 @@
 
             if (processedOuterWays.contains(outerWay)) {
-                JOptionPane.showMessageDialog(Main.parent, tr("Sorry. Cannot handle way that is outer in multiple multipolygon relations."));
+                new Notification(
+                        tr("Sorry. Cannot handle way that is outer in multiple multipolygon relations."))
+                        .setIcon(JOptionPane.INFORMATION_MESSAGE)
+                        .show();
                 return null;
             }
 
             if (processedInnerWays.contains(outerWay)) {
-                JOptionPane.showMessageDialog(Main.parent, tr("Sorry. Cannot handle way that is both inner and outer in multipolygon relations."));
+                new Notification(
+                        tr("Sorry. Cannot handle way that is both inner and outer in multipolygon relations."))
+                        .setIcon(JOptionPane.INFORMATION_MESSAGE)
+                        .show();
                 return null;
             }
@@ -1234 +1260 @@
             {
                 if (processedOuterWays.contains(way)) {
-                    JOptionPane.showMessageDialog(Main.parent, tr("Sorry. Cannot handle way that is both inner and outer in multipolygon relations."));
+                    new Notification(
+                            tr("Sorry. Cannot handle way that is both inner and outer in multipolygon relations."))
+                            .setIcon(JOptionPane.INFORMATION_MESSAGE)
+                            .show();
                     return null;
                 }
 
                 if (processedInnerWays.contains(way)) {
-                    JOptionPane.showMessageDialog(Main.parent, tr("Sorry. Cannot handle way that is inner in multiple multipolygon relations."));
+                    new Notification(
+                            tr("Sorry. Cannot handle way that is inner in multiple multipolygon relations."))
+                            .setIcon(JOptionPane.INFORMATION_MESSAGE)
+                            .show();
                     return null;
                 }