Changeset 6594 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation

Timestamp:

2014-01-02T00:58:33+01:00 (10 years ago)

Author:

simon04

Message:

fix #8969 fix #9394 - add "Do not show again (this session)" choice, and in addition "Do not show again (this operation)" if a bulk operation has been marked in the code

The dialog displays 3 or 4 radio boxes with the labels:

• "Show this dialog again the next time"
• "Do not show again (this operation)"
• "Do not show again (this session)"
• "Do not show again (remembers choice)"

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -768 +768 @@
                 return primitives;
             List<OsmPrimitive> ret = new ArrayList<OsmPrimitive>();
+            ConditionalOptionPaneUtil.startBulkOperation("add_primitive_to_relation");
             for (OsmPrimitive primitive : primitives) {
                 if (primitive instanceof Relation && getRelation() != null && getRelation().equals(primitive)) {
@@ -782 +783 @@
                 }
             }
+            ConditionalOptionPaneUtil.endBulkOperation("add_primitive_to_relation");
             return ret;
         }