Changeset 5070 in josm for trunk/src/org

Timestamp:

2012-03-11T14:14:31+01:00 (12 years ago)

Author:

akks

Message:

Fix regression (#5006) - shortcuts preferences sorting and filtering for both columns

Location:

trunk/src/org/openstreetmap/josm/gui/preferences/shortcut

Files:

• PrefJPanel.java (modified) (4 diffs)
• ShortcutPreference.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

@@ -17 +17 @@
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
-import java.util.HashMap;
 import java.util.Map;
 
@@ -27 +26 @@
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
-import javax.swing.JEditorPane;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -149 +147 @@
     }
 
-    private static class ShortcutTableCellRenderer extends DefaultTableCellRenderer {
+    private class ShortcutTableCellRenderer extends DefaultTableCellRenderer {
 
         private boolean name;
@@ -156 +154 @@
             this.name = name;
         }
-
+        
         @Override
         public Component getTableCellRendererComponent(JTable table, Object value, boolean
                 isSelected, boolean hasFocus, int row, int column) {
-            if(value instanceof Shortcut)
-            {
-                Shortcut sc = (Shortcut) value;
-                JLabel label = (JLabel) super.getTableCellRendererComponent(
-                    table, name ? sc.getLongText() : sc.getKeyText(), isSelected, hasFocus, row, column);
-                label.setBackground(Main.pref.getUIColor("Table.background"));
-                if (isSelected) {
-                    label.setForeground(Main.pref.getUIColor("Table.foreground"));
-                }
-                if(sc.getAssignedUser()) {
-                    label.setBackground(Main.pref.getColor(
-                            marktr("Shortcut Background: User"),
-                            new Color(200,255,200)));
-                } else if(!sc.getAssignedDefault()) {
-                    label.setBackground(Main.pref.getColor(
-                            marktr("Shortcut Background: Modified"),
-                            new Color(255,255,200)));
-                }
-                return label;
-            }
-            return null;
-        }
-    }
-
+            int row1 = shortcutTable.convertRowIndexToModel(row);
+            Shortcut sc = (Shortcut)model.getValueAt(row1, -1);
+            if (sc==null) return null;
+            JLabel label = (JLabel) super.getTableCellRendererComponent(
+                table, name ? sc.getLongText() : sc.getKeyText(), isSelected, hasFocus, row, column);
+            label.setBackground(Main.pref.getUIColor("Table.background"));
+            if (isSelected) {
+                label.setForeground(Main.pref.getUIColor("Table.foreground"));
+            }
+            if(sc.getAssignedUser()) {
+                label.setBackground(Main.pref.getColor(
+                        marktr("Shortcut Background: User"),
+                        new Color(200,255,200)));
+            } else if(!sc.getAssignedDefault()) {
+                label.setBackground(Main.pref.getColor(
+                        marktr("Shortcut Background: Modified"),
+                        new Color(255,255,200)));
+            }
+            return label;
+        }
+    }
+    
     private void initComponents() {
         JPanel listPane = new JPanel();

trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java

@@ -65 +65 @@
         }
         public Object getValueAt(int row, int col) {
-            return data.get(row);
+            return (col==0)?  data.get(row).getLongText() : data.get(row);
         }
         @Override