Changeset 9507 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java

Timestamp:

2016-01-17T18:25:47+01:00 (8 years ago)

Author:

Don-vip

Message:

advanced preferences - refactoring to reduce code duplication

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java (modified) (5 diffs)

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Dimension;
 import java.awt.GridBagLayout;
 import java.util.ArrayList;
@@ -18 +17 @@
 
 import org.openstreetmap.josm.data.Preferences.ListSetting;
-import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Utils;
-import org.openstreetmap.josm.tools.WindowGeometry;
 
 /**
  * Editor for List preference entries.
+ * @since 4634
  */
-public class ListEditor extends ExtendedDialog {
+public class ListEditor extends AbstractListEditor<String> {
 
-    private List<String> data;
-    private final transient PrefEntry entry;
+    private final List<String> data;
 
     /**
@@ -40 +37 @@
      */
     public ListEditor(final JComponent gui, PrefEntry entry, ListSetting setting) {
-        super(gui, tr("Change list setting"), new String[] {tr("OK"), tr("Cancel")});
-        this.entry = entry;
+        super(gui, tr("Change list setting"), entry);
         List<String> orig = setting.getValue();
         if (orig != null) {
@@ -48 +44 @@
             data = new ArrayList<>();
         }
-        setButtonIcons(new String[] {"ok.png", "cancel.png"});
-        setRememberWindowGeometry(getClass().getName() + ".geometry", WindowGeometry.centerInWindow(gui, new Dimension(300, 350)));
         setContent(build(), false);
     }
 
-    /**
-     * Returns the list of values.
-     * @return The list of values.
-     */
+    @Override
     public List<String> getData() {
         return new ArrayList<>(Utils.filter(data, new Predicate<String>() {
@@ -66 +57 @@
     }
 
+    @Override
     protected final JPanel build() {
         JPanel p = new JPanel(new GridBagLayout());