Changeset 5844 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java

Timestamp:

2013-04-13T12:04:29+02:00 (11 years ago)

Author:

akks

Message:

Remote control: fix table cell editing in add_tags dialog, fixed all EDT violations

File:

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

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

@@ -13 +13 @@
 import java.util.Collection;
 import javax.swing.AbstractAction;
+import javax.swing.DefaultCellEditor;
 
 import javax.swing.JPanel;
 import javax.swing.JTable;
+import javax.swing.JTextField;
 import javax.swing.KeyStroke;
 import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableModel;
@@ -27 +30 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.util.TableCellEditorSupport;
 import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.tools.GBC;
@@ -67 +71 @@
 
         DefaultTableModel tm = new DefaultTableModel(new String[] {tr("Assume"), tr("Key"), tr("Value")}, tags.length) {
+            final Class<?> types[] = {Boolean.class, String.class, Object.class};
             @Override
             public Class getColumnClass(int c) {
-                return getValueAt(0, c).getClass();
+                return types[c];
             }
 
@@ -97 +102 @@
 
             private static final long serialVersionUID = 1L;
+            ///private final DefaultCellEditor textEditor = new DefaultCellEditor( new JTextField() );
 
             @Override
@@ -109 +115 @@
                 }
                 return c;
+            }
+
+            @Override
+            public TableCellEditor getCellEditor(int row, int column) {
+                Object value = getValueAt(row,column);
+                System.out.println(value);
+                if (value instanceof DeleteTagMarker) return null;
+                return getDefaultEditor(value.getClass());
             }
         };