Changeset 4148 in josm for trunk/src/org/openstreetmap

Timestamp:

2011-06-19T18:35:06+02:00 (13 years ago)

Author:

stoecker

Message:

fix #6198 - preset applied to invalid objects

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/properties/PresetListPanel.java (modified) (1 diff)
• tagging/TaggingPreset.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java

@@ -57 +57 @@
         }
         public void mouseClicked(MouseEvent arg0) {
-            Collection<OsmPrimitive> selection = presetHandler.getSelection();
+            Collection<OsmPrimitive> selection = tag.createSelection(presetHandler.getSelection());
             if (selection == null || selection.isEmpty())
                 return;

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -1358 +1358 @@
         if (Main.main.getCurrentDataSet() == null) return;
 
-        Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getSelected();
+        Collection<OsmPrimitive> sel = createSelection(Main.main.getCurrentDataSet().getSelected());
         int answer = showDialog(sel, supportsRelation());
 
@@ -1389 +1389 @@
     }
 
-    public int showDialog(Collection<OsmPrimitive> selection, final boolean showNewRelation) {
-        Collection<OsmPrimitive> sel = createSelection(selection);
+    public int showDialog(Collection<OsmPrimitive> sel, final boolean showNewRelation) {
         PresetPanel p = createPanel(sel);
         if (p == null)
@@ -1447 +1446 @@
      * @return Cleaned list with suitable OsmPrimitives only
      */
-    private Collection<OsmPrimitive> createSelection(Collection<OsmPrimitive> participants) {
+    public Collection<OsmPrimitive> createSelection(Collection<OsmPrimitive> participants) {
         originalSelectionEmpty = participants.size() == 0;
         Collection<OsmPrimitive> sel = new LinkedList<OsmPrimitive>();