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

Timestamp:

2014-10-30T20:23:04+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #10498 - Remote Control applies tags incorrectly

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (modified) (12 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java

@@ -31 +31 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
-import org.openstreetmap.josm.data.SelectionChangedListener;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -40 +38 @@
 
 /**
- *
- * @author master
- *
- * Dialog to add tags as part of the remotecontrol
+ * Dialog to add tags as part of the remotecontrol.
  * Existing Keys get grey color and unchecked selectboxes so they will not overwrite the old Key-Value-Pairs by default.
  * You can choose the tags you want to add by selectboxes. You can edit the tags before you apply them.
- *
+ * @author master
+ * @since 3850
  */
-public class AddTagsDialog extends ExtendedDialog implements SelectionChangedListener {
-
-
-    /** initially given tags  **/
-    String[][] tags;
+public class AddTagsDialog extends ExtendedDialog {
 
     private final JTable propertyTable;
-    private Collection<? extends OsmPrimitive> sel;
-    int[] count;
-
-    String sender;
-    static Set<String> trustedSenders = new HashSet<>();
+    private final Collection<? extends OsmPrimitive> sel;
+    private final int[] count;
+
+    private final String sender;
+    private static final Set<String> trustedSenders = new HashSet<>();
 
     /**
@@ -122 +114 @@
     }
 
-    public AddTagsDialog(String[][] tags, String senderName) {
+    /**
+     * Constructs a new {@code AddTagsDialog}.
+     */
+    public AddTagsDialog(String[][] tags, String senderName, Collection<? extends OsmPrimitive> primitives) {
         super(Main.parent, tr("Add tags to selected objects"), new String[] { tr("Add selected tags"), tr("Add all tags"),  tr("Cancel")},
                 false,
@@ -129 +124 @@
 
         this.sender = senderName;
-
-        DataSet.addSelectionListener(this);
-
 
         final DefaultTableModel tm = new DefaultTableModel(new String[] {tr("Assume"), tr("Key"), tr("Value"), tr("Existing values")}, tags.length) {
@@ -141 +133 @@
         };
 
-        sel = Main.main.getCurrentDataSet().getSelected();
+        sel = primitives;
         count = new int[tags.length];
 
@@ -168 +160 @@
         propertyTable = new JTable(tm) {
 
-            private static final long serialVersionUID = 1L;
-
             @Override
             public Component prepareRenderer(TableCellRenderer renderer, int row, int column) {
@@ -200 +190 @@
                 return tr("Enable the checkbox to accept the value");
             }
-
         };
 
@@ -240 +229 @@
 
     /**
-     * This method looks for existing tags in the current selection and sets the corresponding boolean in the boolean array existing[]
-     */
-    private void findExistingTags() {
-        TableModel tm = propertyTable.getModel();
-        for (int i=0; i<tm.getRowCount(); i++) {
-            String key = (String)tm.getValueAt(i, 1);
-            String value = (String)tm.getValueAt(i, 1);
-            count[i] = 0;
-            for (OsmPrimitive osm : sel) {
-                if (osm.keySet().contains(key) && !osm.get(key).equals(value)) {
-                    count[i]++;
-                    break;
-                }
-            }
-        }
-        propertyTable.repaint();
-    }
-
-    /**
      * If you click the "Add tags" button build a ChangePropertyCommand for every key that has a checked checkbox to apply the key value pair to all selected osm objects.
      * You get a entry for every key in the command queue.
@@ -280 +250 @@
         }
         setVisible(false);
-    }
-
-    @Override
-    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-        sel = newSelection;
-        findExistingTags();
     }
 
@@ -323 +287 @@
                     }
                 }
-
-
             });
         }
@@ -332 +294 @@
      * Ask user and add the tags he confirm.
      * @param keyValue is a table or {{tag1,val1},{tag2,val2},...}
-     * @param sender is a string for skipping confirmations. Use epmty string for always confirmed adding.
+     * @param sender is a string for skipping confirmations. Use empty string for always confirmed adding.
      * @param primitives OSM objects that will be modified
      * @since 7521
@@ -344 +306 @@
             }
         } else {
-            new AddTagsDialog(keyValue, sender).showDialog();
+            new AddTagsDialog(keyValue, sender, primitives).showDialog();
         }
     }