Changeset 6622 in josm for trunk/src

Timestamp:

2014-01-04T04:55:24+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9526 - Undesirable messages during data validation (introduced in r6575)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/CreateMultipolygonAction.java (modified) (5 diffs)
• data/validation/tests/MultipolygonTest.java (modified) (1 diff)

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

@@ -184 +184 @@
         selectedWays.addAll(selectedMultipolygonRelation.getMemberPrimitives(Way.class));
 
-        final MultipolygonCreate polygon = analyzeWays(selectedWays);
+        final MultipolygonCreate polygon = analyzeWays(selectedWays, true);
         if (polygon == null) {
             return null; //could not make multipolygon.
@@ -195 +195 @@
      * Returns a {@link Pair} null and the newly created/modified multipolygon {@link Relation}.
      */
-    public static Pair<Relation, Relation> createMultipolygonRelation(Collection<Way> selectedWays) {
-
-        final MultipolygonCreate polygon = analyzeWays(selectedWays);
+    public static Pair<Relation, Relation> createMultipolygonRelation(Collection<Way> selectedWays, boolean showNotif) {
+
+        final MultipolygonCreate polygon = analyzeWays(selectedWays, showNotif);
         if (polygon == null) {
             return null; //could not make multipolygon.
@@ -211 +211 @@
 
         final Pair<Relation, Relation> rr = selectedMultipolygonRelation == null
-                ? createMultipolygonRelation(selectedWays)
+                ? createMultipolygonRelation(selectedWays, true)
                 : updateMultipolygonRelation(selectedWays, selectedMultipolygonRelation);
         if (rr == null) {
@@ -258 +258 @@
      * @return <code>null</code>, if there was a problem with the ways.
      */
-    private static MultipolygonCreate analyzeWays(Collection < Way > selectedWays) {
+    private static MultipolygonCreate analyzeWays(Collection < Way > selectedWays, boolean showNotif) {
 
         MultipolygonCreate pol = new MultipolygonCreate();
@@ -264 +264 @@
 
         if (error != null) {
-            new Notification(error)
-                    .setIcon(JOptionPane.INFORMATION_MESSAGE)
-                    .show();
+            if (showNotif) {
+                new Notification(error)
+                        .setIcon(JOptionPane.INFORMATION_MESSAGE)
+                        .show();
+            }
             return null;
         } else {

trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java

@@ -184 +184 @@
 
             // Create new multipolygon using the logics from CreateMultipolygonAction and see if roles match.
-            final Pair<Relation, Relation> newMP = CreateMultipolygonAction.createMultipolygonRelation(r.getMemberPrimitives(Way.class));
+            final Pair<Relation, Relation> newMP = CreateMultipolygonAction.createMultipolygonRelation(r.getMemberPrimitives(Way.class), false);
             if (newMP != null) {
                 for (RelationMember member : r.getMembers()) {