Changeset 5706 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2013-02-12T11:32:16+01:00 (11 years ago)

Author:

akks

Message:

remote control load_and_zoom+addtags improvemens, allow to delete tags (by setting empty value)
trim spaces from key/value, allow "=" in value

Location:

trunk/src/org/openstreetmap/josm/io/remotecontrol

Files:

• AddTagsDialog.java (modified) (10 diffs)
• handler/LoadAndZoomHandler.java (modified) (1 diff)

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

@@ -10 +10 @@
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 import java.util.Collection;
+import javax.swing.AbstractAction;
 
 import javax.swing.JPanel;
 import javax.swing.JTable;
+import javax.swing.KeyStroke;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableCellRenderer;
@@ -40 +43 @@
     private final JTable propertyTable;
     private Collection<? extends OsmPrimitive> sel;
-    boolean[] existing;
+    int[] count;
 
+    static class DeleteTagMarker {
+        int num;
+        public DeleteTagMarker(int num) {
+            this.num = num;
+        }
+        public String toString() {
+            return tr("<delete from {0} objects>", num);
+        }
+    }
+    
+            
     public AddTagsDialog(String[][] tags) {
-        super(Main.parent, tr("Add tags to selected objects"), new String[] { tr("Add tags"), tr("Cancel")},
+        super(Main.parent, tr("Add tags to selected objects"), new String[] { tr("Add selected tags"), tr("Add all tags"),  tr("Cancel")},
                 false,
                 true);
-
+        setToolTipTexts(new String[]{tr("Add checked tags to selected objects"), tr("Shift+Enter: Add all tags to selected objects"), ""});
+     
         DataSet.addSelectionListener(this);
 
@@ -59 +74 @@
 
         sel = Main.main.getCurrentDataSet().getSelected();
-        existing = new boolean[tags.length];
-
+        count = new int[tags.length];
+        
         for (int i = 0; i<tags.length; i++) {
-            existing[i] = false;
+            count[i] = 0;
             String key = tags[i][0];
             Boolean b = Boolean.TRUE;
@@ -68 +83 @@
                 if (osm.keySet().contains(key)) {
                     b = Boolean.FALSE;
-                    existing[i]=true;
+                    count[i]++;
                     break;
                 }
@@ -74 +89 @@
             tm.setValueAt(b, i, 0);
             tm.setValueAt(tags[i][0], i, 1);
-            tm.setValueAt(tags[i][1], i, 2);
+            tm.setValueAt(tags[i][1].isEmpty() ? new DeleteTagMarker(count[i]) : tags[i][1], i, 2);
         }
 
@@ -84 +99 @@
             public Component prepareRenderer(TableCellRenderer renderer, int row, int column) {
                 Component c = super.prepareRenderer(renderer, row, column);
-                if (existing[row]) {
+                if (count[row]>0) {
                     c.setFont(c.getFont().deriveFont(Font.ITALIC));
                     c.setForeground(new Color(100, 100, 100));
@@ -94 +109 @@
             }
         };
-
+        
         // a checkbox has a size of 15 px
         propertyTable.getColumnModel().getColumn(0).setMaxWidth(15);
         // get edit results if the table looses the focus, for example if a user clicks "add tags"
         propertyTable.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
+        propertyTable.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.SHIFT_MASK), "shiftenter");
+        propertyTable.getActionMap().put("shiftenter", new AbstractAction() {
+            @Override  public void actionPerformed(ActionEvent e) { 
+                buttonAction(1, e); // add all tags on Shift-Enter
+            }
+        });
 
         // set the content of this AddTagsDialog consisting of the tableHeader and the table itself.
@@ -106 +127 @@
         tablePanel.add(propertyTable, GBC.eol().fill(GBC.BOTH));
         setContent(tablePanel);
-
+        setDefaultButton(2);
         // set the default Dimensions and show the dialog
         setPreferredSize(new Dimension(400,tablePanel.getPreferredSize().height+100));
@@ -119 +140 @@
         for (int i=0; i<tm.getRowCount(); i++) {
             String key = (String)tm.getValueAt(i, 1);
-            existing[i] = false;
+            count[i] = 0;
             for (OsmPrimitive osm : sel) {
                 if (osm.keySet().contains(key)) {
-                    existing[i] = true;
+                    count[i]++;
                     break;
                 }
@@ -136 +157 @@
     @Override
     protected void buttonAction(int buttonIndex, ActionEvent evt) {
-        if (buttonIndex == 0) {
+        if (buttonIndex != 2) {
             TableModel tm = propertyTable.getModel();
             for (int i=0; i<tm.getRowCount(); i++) {
-                if ((Boolean)tm.getValueAt(i, 0)) {
-                    Main.main.undoRedo.add(new ChangePropertyCommand(sel, (String)tm.getValueAt(i, 1), (String)tm.getValueAt(i, 2)));
+                if (buttonIndex==1 || (Boolean)tm.getValueAt(i, 0)) {
+                    String key =(String)tm.getValueAt(i, 1);
+                    Object value = tm.getValueAt(i, 2);
+                    Main.main.undoRedo.add(new ChangePropertyCommand(sel,
+                            key, value instanceof String ? (String) value : ""));
                 }
             }

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java

@@ -218 +218 @@
                         int i = 0;
                         for (String tag : tagSet) {
-                            keyValue[i++] = tag.split("=");
+                            // support a  =   b===c as "a"="b===c"
+                            String [] pair = tag.split("\\s*=\\s*",2); 
+                            keyValue[i][0] = pair[0];
+                            keyValue[i][1] = pair.length<2 ? "": pair[1];
+                            i++;
                         }