Changeset 4634 in josm

Timestamp:

Dec 4, 2011 7:17:56 PM (19 months ago)

Author:

bastiK

Message:

advanced preference: dialogs to edit complex preference settings (list, list of lists, list of maps) (see #7027)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (14 diffs)
• gui/preferences/PreferenceTabbedPane.java (modified) (1 diff)
• gui/preferences/advanced (added)
• gui/preferences/advanced/AdvancedPreference.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java) (11 diffs)
• gui/preferences/advanced/ListEditor.java (added)
• gui/preferences/advanced/ListListEditor.java (added)
• gui/preferences/advanced/MapListEditor.java (added)
• gui/preferences/advanced/StringEditor.java (added)
• tools/WindowGeometry.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -65 +65 @@
  * accessed using one of the get...() methods. You can use the same preference
  * key in different parts of the code, but the default value must be the same
- * everywhere. null is a legitimate default value.
+ * everywhere. A default value of null means, the setting has been requested, but
+ * no default value was set. This is used in advanced preferences to present a list
+ * off all possible settings.
  *
  * At the moment, there is no such thing as an empty value.
@@ -99 +101 @@
         T getValue();
         void visit(SettingVisitor visitor);
+        Setting<T> getNullInstance();
     }
 
@@ -118 +121 @@
             visitor.visit(this);
         }
+        public StringSetting getNullInstance() {
+            return new StringSetting(null);
+        }
     }
 
@@ -127 +133 @@
             visitor.visit(this);
         }
+        public ListSetting getNullInstance() {
+            return new ListSetting(null);
+        }
     }
 
@@ -136 +145 @@
             visitor.visit(this);
         }
+        public ListListSetting getNullInstance() {
+            return new ListListSetting(null);
+        }
     }
 
@@ -144 +156 @@
         public void visit(SettingVisitor visitor) {
             visitor.visit(this);
+        }
+        public MapListSetting getNullInstance() {
+            return new MapListSetting(null);
         }
     }
@@ -825 +840 @@
      */
     public Collection<String> getCollection(String key, Collection<String> def) {
-        if (def != null) {
-            putCollectionDefault(key, new ArrayList<String>(def));
-        }
+        putCollectionDefault(key, def == null ? null : new ArrayList<String>(def));
         Collection<String> prop = getCollectionInternal(key);
         if (prop != null)
@@ -904 +917 @@
     }
 
-    private static boolean equalCollection(Collection<String> a, Collection<String> b) {
+    public static boolean equalCollection(Collection<String> a, Collection<String> b) {
         if (a == null) return b == null;
         if (b == null) return false;
@@ -947 +960 @@
             }
             putArrayDefault(key, Collections.unmodifiableList(defCopy));
+        } else {
+            putArrayDefault(key, null);
         }
         List<List<String>> prop = getArrayInternal(key);
@@ -955 +970 @@
         } else
             return def;
+    }
+
+    public Collection<Collection<String>> getArray(String key) {
+        putArrayDefault(key, null);
+        List<List<String>> prop = getArrayInternal(key);
+        if (prop != null) {
+            @SuppressWarnings("unchecked")
+            Collection<Collection<String>> prop_cast = (Collection) prop;
+            return prop_cast;
+        } else
+            return Collections.emptyList();
     }
 
@@ -1020 +1046 @@
     }
 
-    private static boolean equalArray(Collection<Collection<String>> a, Collection<List<String>> b) {
+    public static boolean equalArray(Collection<Collection<String>> a, Collection<List<String>> b) {
         if (a == null) return b == null;
         if (b == null) return false;
@@ -1043 +1069 @@
             }
             putListOfStructsDefault(key, Collections.unmodifiableList(defCopy));
+        } else {
+            putListOfStructsDefault(key, null);
         }
         Collection<Map<String, String>> prop = getListOfStructsInternal(key);
@@ -1117 +1145 @@
     }
 
-    private static boolean equalListOfStructs(Collection<Map<String, String>> a, Collection<Map<String, String>> b) {
+    public static boolean equalListOfStructs(Collection<Map<String, String>> a, Collection<Map<String, String>> b) {
         if (a == null) return b == null;
         if (b == null) return false;
@@ -1298 +1326 @@
         }
         return struct;
+    }
+
+    public boolean putSetting(final String key, Setting value) {
+        if (value == null) return false;
+        class PutVisitor implements SettingVisitor {
+            public boolean changed;
+            public void visit(StringSetting setting) {
+                changed = put(key, setting.getValue());
+            }
+            public void visit(ListSetting setting) {
+                changed = putCollection(key, setting.getValue());
+            }
+            public void visit(ListListSetting setting) {
+                changed = putArray(key, (Collection) setting.getValue());
+            }
+            public void visit(MapListSetting setting) {
+                changed = putListOfStructs(key, setting.getValue());
+            }
+        };
+        PutVisitor putVisitor = new PutVisitor();
+        value.visit(putVisitor);
+        return putVisitor.changed;
+    }
+
+    public Map<String, Setting> getAllSettings() {
+        Map<String, Setting> settings = new TreeMap<String, Setting>();
+
+        for (Entry<String, String> e : properties.entrySet()) {
+            settings.put(e.getKey(), new StringSetting(e.getValue()));
+        }
+        for (Entry<String, List<String>> e : collectionProperties.entrySet()) {
+            settings.put(e.getKey(), new ListSetting(e.getValue()));
+        }
+        for (Entry<String, List<List<String>>> e : arrayProperties.entrySet()) {
+            settings.put(e.getKey(), new ListListSetting(e.getValue()));
+        }
+        for (Entry<String, List<Map<String, String>>> e : listOfStructsProperties.entrySet()) {
+            settings.put(e.getKey(), new MapListSetting(e.getValue()));
+        }
+        return settings;
+    }
+
+    public Map<String, Setting> getAllDefaults() {
+        Map<String, Setting> allDefaults = new TreeMap<String, Setting>();
+
+        for (Entry<String, String> e : defaults.entrySet()) {
+            allDefaults.put(e.getKey(), new StringSetting(e.getValue()));
+        }
+        for (Entry<String, List<String>> e : collectionDefaults.entrySet()) {
+            allDefaults.put(e.getKey(), new ListSetting(e.getValue()));
+        }
+        for (Entry<String, List<List<String>>> e : arrayDefaults.entrySet()) {
+            allDefaults.put(e.getKey(), new ListListSetting(e.getValue()));
+        }
+        for (Entry<String, List<Map<String, String>>> e : listOfStructsDefaults.entrySet()) {
+            allDefaults.put(e.getKey(), new MapListSetting(e.getValue()));
+        }
+        return allDefaults;
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

@@ -28 +28 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.preferences.advanced.AdvancedPreference;
 import org.openstreetmap.josm.plugins.PluginDownloadTask;
 import org.openstreetmap.josm.plugins.PluginHandler;

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
-package org.openstreetmap.josm.gui.preferences;
+package org.openstreetmap.josm.gui.preferences.advanced;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -6 +6 @@
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.Font;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
@@ -11 +12 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.util.Arrays;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
-import java.util.TreeMap;
-import java.util.TreeSet;
 import java.util.Map.Entry;
+import java.util.Collection;
+import java.util.Collections;
 
 import javax.swing.Box;
+import javax.swing.ButtonGroup;
 import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JRadioButton;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
@@ -30 +33 @@
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.DefaultTableModel;
+import javax.swing.DefaultCellEditor;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
+import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
+import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.Preferences.ListListSetting;
+import org.openstreetmap.josm.data.Preferences.ListSetting;
+import org.openstreetmap.josm.data.Preferences.MapListSetting;
+import org.openstreetmap.josm.data.Preferences.Setting;
+import org.openstreetmap.josm.data.Preferences.StringSetting;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Utils;
 
 public class AdvancedPreference implements PreferenceSetting {
@@ -43 +58 @@
     }
 
-    private Map<String,String> orig;
-    private Map<String,String> defaults;
-    private DefaultTableModel model;
-    protected Map<String, String> data;
+    public static class PrefEntry implements Comparable<PrefEntry> {
+        private String key;
+        private Setting value;
+        private Setting defaultValue;
+        private boolean isDefault;
+        private boolean changed;
+
+        public PrefEntry(String key, Setting value, Setting defaultValue, boolean isDefault) {
+            CheckParameterUtil.ensureParameterNotNull(key);
+            CheckParameterUtil.ensureParameterNotNull(value);
+            CheckParameterUtil.ensureParameterNotNull(defaultValue);
+            this.key = key;
+            this.value = value;
+            this.defaultValue = defaultValue;
+            this.isDefault = isDefault;
+        }
+
+        public String getKey() {
+            return key;
+        }
+
+        public Setting getValue() {
+            return value;
+        }
+
+        public void setValue(Setting value) {
+            this.value = value;
+            changed = true;
+            isDefault = false;
+        }
+
+        public boolean isDefault() {
+            return isDefault;
+        }
+
+        public boolean isChanged() {
+            return changed;
+        }
+
+        public void reset() {
+            value = defaultValue;
+            changed = true;
+            isDefault = true;
+        }
+
+        public int compareTo(PrefEntry other) {
+            return key.compareTo(other.key);
+        }
+    }
+
+    private AllSettingsTableModel model;
+    protected List<PrefEntry> data;
+    protected List<PrefEntry> displayData;
     protected JTextField txtFilter;
 
@@ -59 +123 @@
         p.add(txtFilter, GBC.eol().fill(GBC.HORIZONTAL));
         txtFilter.getDocument().addDocumentListener(new DocumentListener(){
-            public void changedUpdate(DocumentEvent e) {
+            @Override public void changedUpdate(DocumentEvent e) {
                 action();
             }
-
-            public void insertUpdate(DocumentEvent e) {
+            @Override public void insertUpdate(DocumentEvent e) {
                 action();
             }
-
-            public void removeUpdate(DocumentEvent e) {
+            @Override public void removeUpdate(DocumentEvent e) {
                 action();
             }
-
             private void action() {
-                dataToModel();
+                applyFilter();
             }
         });
 
-        model = new DefaultTableModel(new String[]{tr("Key"), tr("Value")},0) {
-            @Override public boolean isCellEditable(int row, int column) {
-                return column != 0;
-            }
-            @Override public void fireTableCellUpdated(int row, int column)
-            {
-                super.fireTableCellUpdated(row, column);
-                if(column == 1)
-                {
-                    data.put((String) model.getValueAt(row, 0),
-                            (String) model.getValueAt(row, 1));
-                }
-            }
-
-        };
-        DefaultTableCellRenderer renderer = new DefaultTableCellRenderer(){
-            @Override
-            public Component getTableCellRendererComponent(JTable table, Object value,
-                    boolean isSelected, boolean hasFocus, int row, int column)
-            {
-                JLabel label=new JLabel();
-                String s = defaults.get(value);
-                if(s != null)
-                {
-                    if(s.equals(model.getValueAt(row, 1))) {
-                        label.setToolTipText(tr("Current value is default."));
-                    } else {
-                        label.setToolTipText(tr("Default value is ''{0}''.", s));
-                    }
-                } else {
-                    label.setToolTipText(tr("Default value currently unknown (setting has not been used yet)."));
-                }
-                label.setText((String)value);
-                return label;
-            }
-        };
+        Map<String, Setting> orig = Main.pref.getAllSettings();
+        Map<String, Setting> defaults = Main.pref.getAllDefaults();
+        orig.remove("osm-server.password");
+        defaults.remove("osm-server.password");
+        prepareData(orig, defaults);
+        model = new AllSettingsTableModel();
+        applyFilter();
+
         final JTable list = new JTable(model);
         list.putClientProperty("terminateEditOnFocusLost", true);
-        list.getColumn(tr("Key")).setCellRenderer(renderer);
+        list.getColumnModel().getColumn(1).setCellRenderer(new SettingCellRenderer());
+        list.getColumnModel().getColumn(1).setCellEditor(new SettingCellEditor());
+
         JScrollPane scroll = new JScrollPane(list);
         p.add(scroll, GBC.eol().fill(GBC.BOTH));
         scroll.setPreferredSize(new Dimension(400,200));
-
-        orig = Main.pref.getAllPrefix("");
-        defaults = Main.pref.getDefaults();
-        orig.remove("osm-server.password");
-        defaults.remove("osm-server.password");
-        prepareData();
-        dataToModel();
 
         JButton add = new JButton(tr("Add"));
@@ -143 +171 @@
         });
 
-        JButton delete = new JButton(tr("Delete"));
-        p.add(delete, GBC.std().insets(0,5,0,0));
-        delete.addActionListener(new ActionListener(){
+        JButton reset = new JButton(tr("Reset"));
+        p.add(reset, GBC.std().insets(0,5,0,0));
+        reset.addActionListener(new ActionListener(){
             public void actionPerformed(ActionEvent e) {
-                removePreference(gui, list);
+                resetPreference(gui, list);
             }
         });
@@ -160 +188 @@
     }
 
-    private void prepareData() {
-        TreeSet<String> ts = new TreeSet<String>(orig.keySet());
-        for (String s : defaults.keySet())
-        {
-            if(!ts.contains(s)) {
-                ts.add(s);
-            }
-        }
-        data = new TreeMap<String, String>();
-        for (String s : ts)
-        {
-            String val = Main.pref.get(s);
-            if(val == null) {
-                val = "";
-            }
-            data.put(s, val);
-        }
-    }
-
-    private void dataToModel() {
-        while (model.getRowCount() > 0) {
-            model.removeRow(0);
-        }
-        for (String prefKey : data.keySet()) {
-            String prefValue = data.get(prefKey);
+    private void prepareData(Map<String, Setting> orig, Map<String, Setting> defaults) {
+        data = new ArrayList<PrefEntry>();
+        for (Entry<String, Setting> e : orig.entrySet()) {
+            Setting value = e.getValue();
+            Setting def = defaults.get(e.getKey());
+            if (def == null) {
+                def = value.getNullInstance();
+            }
+            PrefEntry en = new PrefEntry(e.getKey(), value, def, false);
+            data.add(en);
+        }
+        for (Entry<String, Setting> e : defaults.entrySet()) {
+            if (!orig.containsKey(e.getKey())) {
+                PrefEntry en = new PrefEntry(e.getKey(), e.getValue(), e.getValue(), true);
+                data.add(en);
+            }
+        }
+        Collections.sort(data);
+        displayData = new ArrayList<PrefEntry>(data);
+    }
+
+    class AllSettingsTableModel extends DefaultTableModel {
+
+        public AllSettingsTableModel() {
+            setColumnIdentifiers(new String[]{tr("Key"), tr("Value")});
+        }
+
+        @Override
+        public boolean isCellEditable(int row, int column) {
+            return column == 1 && (displayData.get(row).getValue() instanceof StringSetting);
+        }
+
+        @Override
+        public int getRowCount() {
+            return displayData.size();
+        }
+
+        @Override
+        public Object getValueAt(int row, int column) {
+            if (column == 0)
+                return displayData.get(row).getKey();
+            else
+                return displayData.get(row);
+        }
+
+        @Override
+        public void setValueAt(Object o, int row, int column) {
+            PrefEntry pe = displayData.get(row);
+            String s = (String) o;
+            if (!s.equals(pe.getValue().getValue())) {
+                pe.setValue(new StringSetting(s));
+                fireTableCellUpdated(row, column);
+            }
+        }
+    }
+
+    private class SettingCellRenderer extends DefaultTableCellRenderer {
+        @Override
+        public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
+            if (value == null)
+                return this;
+            PrefEntry pe = (PrefEntry) value;
+            Setting setting = pe.getValue();
+            Object val = setting.getValue();
+            String display = val != null ? val.toString() : "<html><i>&lt;"+tr("unset")+"&gt;</i></html>";
+
+            JLabel label = (JLabel)super.getTableCellRendererComponent(table,
+                    display, isSelected, hasFocus, row, column);
+            if (!pe.isDefault()) {
+                label.setFont(label.getFont().deriveFont(Font.BOLD));
+            }
+            //label.setToolTipText("..."); TODO
+            return label;
+        }
+    }
+
+    private class SettingCellEditor extends DefaultCellEditor {
+        public SettingCellEditor() {
+            super(new JTextField());
+        }
+
+        public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
+            PrefEntry pe = (PrefEntry) value;
+            StringSetting stg = (StringSetting) pe.getValue();
+            String s = stg.getValue() == null ? "" : stg.getValue();
+            return super.getTableCellEditorComponent(table, s, isSelected, row, column);
+        }
+    }
+
+    private void applyFilter() {
+        displayData.clear();
+        for (PrefEntry e : data) {
+
+            String prefKey = e.getKey();
+            Setting valueSetting = e.getValue();
+            String prefValue = valueSetting.getValue() == null ? "" : valueSetting.getValue().toString();
+
             String input[] = txtFilter.getText().split("\\s+");
             boolean canHas = true;
@@ -195 +295 @@
                 if (!prefKeyLower.contains(bit) && !prefValueLower.contains(bit)) {
                     canHas = false;
-                }
-            }
-
+                    break;
+                }
+            }
             if (canHas) {
-                model.addRow(new String[] {prefKey, prefValue});
-            }
-        }
-    }
-
+                displayData.add(e);
+            }
+        }
+        model.fireTableDataChanged();
+    }
+
+    @Override
     public boolean ok() {
-        for (String key : data.keySet()) {
-            String value = data.get(key);
-            if(value.length() != 0)
-            {
-                String origValue = orig.get(key);
-                if (origValue == null || !origValue.equals(value)) {
-                    Main.pref.put(key, value);
-                }
-                orig.remove(key); // processed.
-            }
-        }
-        for (Entry<String, String> e : orig.entrySet()) {
-            Main.pref.put(e.getKey(), null);
+        for (PrefEntry e : data) {
+            if (e.isChanged()) {
+                Main.pref.putSetting(e.getKey(), e.getValue());
+            }
         }
         return false;
     }
 
-    private void removePreference(final PreferenceTabbedPane gui, final JTable list) {
+    private void resetPreference(final PreferenceTabbedPane gui, final JTable list) {
         if (list.getSelectedRowCount() == 0) {
             JOptionPane.showMessageDialog(
@@ -232 +325 @@
             return;
         }
-        for(int row: list.getSelectedRows()) {
-            data.put((String) model.getValueAt(row, 0), "");
-            model.setValueAt("", row, 1);
-        }
+        for (int row : list.getSelectedRows()) {
+            PrefEntry e = displayData.get(row);
+            e.reset();
+        }
+        model.fireTableDataChanged();
     }
 
     private void addPreference(final PreferenceTabbedPane gui) {
-        String s[] = showEditDialog(gui, tr("Enter a new key/value pair"),
-            "", "");
-        if(s != null && !s[0].isEmpty() && !s[1].isEmpty()) {
-            data.put(s[0], s[1]);
-            dataToModel();
+        JPanel p = new JPanel(new GridBagLayout());
+        p.add(new JLabel(tr("Key")), GBC.std().insets(0,0,5,0));
+        JTextField tkey = new JTextField("", 50);
+        p.add(tkey, GBC.eop().insets(5,0,0,0).fill(GBC.HORIZONTAL));
+
+        p.add(new JLabel(tr("Select Setting Type:")), GBC.eol().insets(5,15,5,0));
+
+        JRadioButton rbString = new JRadioButton(tr("Simple"));
+        JRadioButton rbList = new JRadioButton(tr("List"));
+        JRadioButton rbListList = new JRadioButton(tr("List of lists"));
+        JRadioButton rbMapList = new JRadioButton(tr("List of maps"));
+
+        ButtonGroup group = new ButtonGroup();
+        group.add(rbString);
+        group.add(rbList);
+        group.add(rbListList);
+        group.add(rbMapList);
+
+        p.add(rbString, GBC.eol());
+        p.add(rbList, GBC.eol());
+        p.add(rbListList, GBC.eol());
+        p.add(rbMapList, GBC.eol());
+
+        rbString.setSelected(true);
+
+        ExtendedDialog dlg = new ExtendedDialog(gui, tr("Add setting"), new String[] {tr("OK"), tr("Cancel")});
+        dlg.setButtonIcons(new String[] {"ok.png", "cancel.png"});
+        dlg.setContent(p);
+        dlg.showDialog();
+
+        PrefEntry pe = null;
+        boolean ok = false;
+        if (dlg.getValue() == 1) {
+            if (rbString.isSelected()) {
+                StringSetting sSetting = new StringSetting(null);
+                pe = new PrefEntry(tkey.getText(), sSetting, sSetting, false);
+                StringEditor sEditor = new StringEditor(gui, pe, sSetting);
+                sEditor.showDialog();
+                if (sEditor.getValue() == 1) {
+                    String data = sEditor.getData();
+                    if (!Utils.equal(sSetting.getValue(), data)) {
+                        pe.setValue(new StringSetting(data));
+                        ok = true;
+                    }
+                }
+            } else if (rbList.isSelected()) {
+                ListSetting lSetting = new ListSetting(null);
+                pe = new PrefEntry(tkey.getText(), lSetting, lSetting, false);
+                ListEditor lEditor = new ListEditor(gui, pe, lSetting);
+                lEditor.showDialog();
+                if (lEditor.getValue() == 1) {
+                    List<String> data = lEditor.getData();
+                    if (!Preferences.equalCollection(lSetting.getValue(), data)) {
+                        pe.setValue(new ListSetting(data));
+                        ok = true;
+                    }
+                }
+            } else if (rbListList.isSelected()) {
+                ListListSetting llSetting = new ListListSetting(null);
+                pe = new PrefEntry(tkey.getText(), llSetting, llSetting, false);
+                ListListEditor llEditor = new ListListEditor(gui, pe, llSetting);
+                llEditor.showDialog();
+                if (llEditor.getValue() == 1) {
+                    List<List<String>> data = llEditor.getData();
+                    if (!Preferences.equalArray((Collection) llSetting.getValue(), data)) {
+                        pe.setValue(new ListListSetting(data));
+                        ok = true;
+                    }
+                }
+            } else if (rbMapList.isSelected()) {
+                MapListSetting mlSetting = new MapListSetting(null);
+                pe = new PrefEntry(tkey.getText(), mlSetting, mlSetting, false);
+                MapListEditor mlEditor = new MapListEditor(gui, pe, mlSetting);
+                mlEditor.showDialog();
+                if (mlEditor.getValue() == 1) {
+                    List<Map<String, String>> data = mlEditor.getData();
+                    if (!Preferences.equalListOfStructs(mlSetting.getValue(), data)) {
+                        pe.setValue(new MapListSetting(data));
+                        ok = true;
+                    }
+                }
+            }
+            if (ok) {
+                data.add(pe);
+                Collections.sort(data);
+                applyFilter();
+            }
         }
     }
@@ -257 +433 @@
             return;
         }
-        String key = (String)model.getValueAt(list.getSelectedRow(), 0);
-        String value = data.get(key);
-        if(value.isEmpty())
-            value = defaults.get(key);
-        String s[] = showEditDialog(gui, tr("Change a key/value pair"),
-            key, value);
-        if(s != null && !s[0].isEmpty()) {
-            data.put(s[0], s[1]);
-            if(!s[0].equals(key))
-                data.put(key,"");
-            dataToModel();
-        }
-    }
-
-    private String[] showEditDialog(final PreferenceTabbedPane gui, String title,
-    String key, String value) {
-        JPanel p = new JPanel(new GridBagLayout());
-        p.add(new JLabel(tr("Key")), GBC.std().insets(0,0,5,0));
-        JTextField tkey = new JTextField(key, 50);
-        JTextField tvalue = new JTextField(value, 50);
-        p.add(tkey, GBC.eop().insets(5,0,0,0).fill(GBC.HORIZONTAL));
-        PrefValueTableModel model = new PrefValueTableModel(value);
-        p.add(new JLabel(tr("Values")), GBC.std().insets(0,0,5,0));
-        JTable table = new JTable(model);
-        table.putClientProperty("terminateEditOnFocusLost", true);
-        table.getTableHeader().setVisible(false);
-        JScrollPane pane = new JScrollPane(table);
-        Dimension d = pane.getPreferredSize();
-        d.height = (d.height/20)*(model.getRowCount()+4);
-        pane.setPreferredSize(d);
-        p.add(pane, GBC.eol().insets(5,10,0,0).fill(GBC.HORIZONTAL));
-        ExtendedDialog ed = new ExtendedDialog(gui, title,
-                new String[] {tr("OK"), tr("Cancel")});
-        ed.setButtonIcons(new String[] {"ok.png", "cancel.png"});
-        ed.setContent(p);
-        ed.showDialog();
-        if(ed.getValue() == 1) {
-            return new String[]{tkey.getText(), model.getText()};
-        }
-        return null;
-    }
-    class PrefValueTableModel extends DefaultTableModel {
-        private final ArrayList<String> data = new ArrayList<String>();
-        public PrefValueTableModel(String val) {
-            data.addAll(Arrays.asList(val.split("\u001e")));
-            setColumnIdentifiers(new String[]{""});
-        }
-
-        public String getText() {
-            String s = null;
-            for(String a : data)
-            {
-                if(s == null) {
-                    s = a;
-                } else {
-                    s += "\u001e" + a;
-                }
-            }
-            return s == null ? "" : s;
-        }
-
-        @Override
-        public int getRowCount() {
-            return data == null ? 1 : data.size()+1;
-        }
-
-        @Override
-        public Object getValueAt(int row, int column) {
-            return data.size() == row ? "" : data.get(row);
-        }
-
-        @Override
-        public void setValueAt(Object o, int row, int column) {
-            String s = (String)o;
-            if(row == data.size()) {
-                data.add(s);
-                fireTableRowsInserted(row+1, row+1);
-            } else {
-                data.set(row, s);
-            }
-            fireTableCellUpdated(row, column);
-        }
-
-        @Override
-        public boolean isCellEditable(int row, int column) {
-            return true;
+        final PrefEntry e = (PrefEntry) model.getValueAt(list.getSelectedRow(), 1);
+        Setting stg = e.getValue();
+        if (stg instanceof StringSetting) {
+            list.editCellAt(list.getSelectedRow(), 1);
+            Component editor = list.getEditorComponent();
+            if (editor != null) {
+                editor.requestFocus();
+            }
+        } else if (stg instanceof ListSetting) {
+            ListSetting lSetting = (ListSetting) stg;
+            ListEditor lEditor = new ListEditor(gui, e, lSetting);
+            lEditor.showDialog();
+            if (lEditor.getValue() == 1) {
+                List<String> data = lEditor.getData();
+                if (!Preferences.equalCollection(lSetting.getValue(), data)) {
+                    e.setValue(new ListSetting(data));
+                    applyFilter();
+                }
+            }
+        } else if (stg instanceof ListListSetting) {
+            ListListEditor llEditor = new ListListEditor(gui, e, (ListListSetting) stg);
+            llEditor.showDialog();
+            if (llEditor.getValue() == 1) {
+                List<List<String>> data = llEditor.getData();
+                if (!Preferences.equalArray((Collection) stg.getValue(), data)) {
+                    e.setValue(new ListListSetting(data));
+                    applyFilter();
+                }
+            }
+        } else if (stg instanceof MapListSetting) {
+            MapListSetting mlSetting = (MapListSetting) stg;
+            MapListEditor mlEditor = new MapListEditor(gui, e, mlSetting);
+            mlEditor.showDialog();
+            if (mlEditor.getValue() == 1) {
+                List<Map<String, String>> data = mlEditor.getData();
+                if (!Preferences.equalListOfStructs(mlSetting.getValue(), data)) {
+                    e.setValue(new MapListSetting(data));
+                    applyFilter();
+                }
+            }
         }
     }

trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java

@@ -264 +264 @@
         window.setSize(extent);
     }
+
+    public String toString() {
+        return "WindowGeometry{topLeft="+topLeft+",extent="+extent+"}";
+    }
 }