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

Timestamp:

2013-04-18T17:36:14+02:00 (11 years ago)

Author:

akks

Message:

remote control: new public static method AddTagsDialog.addTags() to add tags with confirmation

File:

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

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

@@ -138 +138 @@
                 return types[c];
             }
-
         };
 
@@ -224 +223 @@
         tablePanel.add(propertyTable.getTableHeader(), GBC.eol().fill(GBC.HORIZONTAL));
         tablePanel.add(propertyTable, GBC.eol().fill(GBC.BOTH));
-        if (!trustedSenders.contains(sender)) {
+        if (!sender.isEmpty() && !trustedSenders.contains(sender)) {
             final JCheckBox c = new JCheckBox();
             c.setAction(new AbstractAction(tr("Accept all tags from {0} for this session", sender) ) {
@@ -320 +319 @@
                             i++;
                         }
-                        addTagsIfNeeded(keyValue, sender);
+                        addTags(keyValue, sender);
                     }
                 }
@@ -329 +328 @@
     }
     
-    private static void addTagsIfNeeded(String[][] keyValue, String sender) {
+    /**
+     * 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.
+     */
+    public static void addTags(String[][] keyValue, String sender) {
         if (trustedSenders.contains(sender)) {
             if (Main.main.getCurrentDataSet() != null) {