Changeset 9086 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

Timestamp:

2015-12-05T15:38:14+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #12153 - Changing sorting order in Tags/Memberships window and clicking in one tag, edits the wrong tag

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (modified) (6 diffs)

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

@@ -53 +53 @@
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
+import javax.swing.JTable;
 import javax.swing.KeyStroke;
 import javax.swing.ListCellRenderer;
@@ -86 +87 @@
  */
 class TagEditHelper {
+    private final JTable tagTable;
     private final DefaultTableModel tagData;
     private final Map<String, Map<String, Integer>> valueCount;
@@ -116 +118 @@
     };
 
-    TagEditHelper(DefaultTableModel propertyData, Map<String, Map<String, Integer>> valueCount) {
+    TagEditHelper(JTable tagTable, DefaultTableModel propertyData, Map<String, Map<String, Integer>> valueCount) {
+        this.tagTable = tagTable;
         this.tagData = propertyData;
         this.valueCount = valueCount;
+    }
+
+    public final String getDataKey(int viewRow) {
+        return tagData.getValueAt(tagTable.convertRowIndexToModel(viewRow), 0).toString();
+    }
+
+    @SuppressWarnings("unchecked")
+    public final Map<String, Integer> getDataValues(int viewRow) {
+        return (Map<String, Integer>) tagData.getValueAt(tagTable.convertRowIndexToModel(viewRow), 1);
     }
 
@@ -152 +164 @@
         if (sel == null || sel.isEmpty()) return;
 
-        String key = tagData.getValueAt(row, 0).toString();
+        String key = getDataKey(row);
         objKey = key;
 
-        @SuppressWarnings("unchecked")
-        final EditTagDialog editDialog = new EditTagDialog(key,
-                (Map<String, Integer>) tagData.getValueAt(row, 1), focusOnKey);
+        final EditTagDialog editDialog = new EditTagDialog(key, getDataValues(row), focusOnKey);
         editDialog.showDialog();
         if (editDialog.getValue() != 1) return;
@@ -567 +577 @@
                 }
                 for (int i = 0; i < tagData.getRowCount(); ++i) {
-                    if (item.getValue().equals(tagData.getValueAt(i, 0))) {
+                    if (item.getValue().equals(getDataKey(i))) {
                         if (itemToSelect == item) {
                             itemToSelect = null;
@@ -831 +841 @@
             // performing this action leads to autocomplete to the next key (see #7671 comments)
             for (int j = 0; j < tagData.getRowCount(); ++j) {
-                if (t.getKey().equals(tagData.getValueAt(j, 0))) {
+                if (t.getKey().equals(getDataKey(j))) {
                     action.setEnabled(false);
                     break;