Changeset 10047 in josm for trunk/src

Timestamp:

2016-03-26T16:00:08+01:00 (9 years ago)

Author:

Don-vip

Message:

add more unit tests

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/ImproveWayAccuracyAction.java (modified) (1 diff)
• gui/preferences/advanced/ListEditor.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java

@@ -94 +94 @@
         @Override
         public void paint(Graphics2D g, MapView mv, Bounds bbox) {
-            ImproveWayAccuracyAction.this.paint(g, mv, bbox);;
+            ImproveWayAccuracyAction.this.paint(g, mv, bbox);
         }
     };

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

@@ -28 +28 @@
 public class ListEditor extends AbstractListEditor<String> {
 
-    private final List<String> data;
+    private final ListSettingTableModel model;
 
     /**
@@ -38 +38 @@
     public ListEditor(final JComponent gui, PrefEntry entry, ListSetting setting) {
         super(gui, tr("Change list setting"), entry);
-        List<String> orig = setting.getValue();
-        if (orig != null) {
-            data = new ArrayList<>(orig);
-        } else {
-            data = new ArrayList<>();
-        }
+        model = new ListSettingTableModel(setting.getValue());
         setContent(build(), false);
     }
@@ -49 +44 @@
     @Override
     public List<String> getData() {
-        return new ArrayList<>(Utils.filter(data, new Predicate<String>() {
+        return new ArrayList<>(Utils.filter(model.getData(), new Predicate<String>() {
             @Override
             public boolean evaluate(String object) {
@@ -61 +56 @@
         JPanel p = new JPanel(new GridBagLayout());
         p.add(new JLabel(tr("Key: {0}", entry.getKey())), GBC.eol().insets(0, 0, 5, 0));
-        ListSettingTableModel listModel = new ListSettingTableModel();
-        JTable table = new JTable(listModel);
+        JTable table = new JTable(model);
         table.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
         table.setTableHeader(null);
@@ -75 +69 @@
     }
 
-    class ListSettingTableModel extends AbstractTableModel {
+    static class ListSettingTableModel extends AbstractTableModel {
+
+        private final List<String> data;
+
+        ListSettingTableModel(List<String> orig) {
+            if (orig != null) {
+                data = new ArrayList<>(orig);
+            } else {
+                data = new ArrayList<>();
+            }
+        }
 
         public List<String> getData() {