Changeset 6578 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java

Timestamp:

2013-12-31T13:04:42+01:00 (12 years ago)

Author:

bastiK

Message:

Preferences rework. Merges the 4 maps for the 4 setting
types into a single map. The code for the get...() and set...()
methods is also unified.
Additional consistency checks.

File:

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

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

@@ -1 +1 @@
 // License: GPL. See LICENSE file for details.
 package org.openstreetmap.josm.gui.preferences.advanced;
+
+import static org.openstreetmap.josm.tools.I18n.marktr;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Color;
@@ -12 +15 @@
 import java.util.List;
 import java.util.Map;
+
 import javax.swing.ButtonGroup;
 import javax.swing.DefaultCellEditor;
@@ -22 +26 @@
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.DefaultTableModel;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Preferences;
@@ -27 +32 @@
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.tools.GBC;
-import static org.openstreetmap.josm.tools.I18n.marktr;
-import static org.openstreetmap.josm.tools.I18n.tr;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -106 +109 @@
             if (lEditor.getValue() == 1) {
                 List<String> data = lEditor.getData();
-                if (!Preferences.equalCollection(lSetting.getValue(), data)) {
+                if (!lSetting.equalVal(data)) {
                     e.setValue(new Preferences.ListSetting(data));
                     return true;
@@ -112 +115 @@
             }
         } else if (stg instanceof Preferences.ListListSetting) {
-            ListListEditor llEditor = new ListListEditor(gui, e, (Preferences.ListListSetting) stg);
+            Preferences.ListListSetting llSetting = (Preferences.ListListSetting) stg;
+            ListListEditor llEditor = new ListListEditor(gui, e, llSetting);
             llEditor.showDialog();
             if (llEditor.getValue() == 1) {
@@ -118 +122 @@
                 @SuppressWarnings("unchecked")
                 Collection<Collection<String>> stgValue = (Collection<Collection<String>>) stg.getValue();
-                if (!Preferences.equalArray(stgValue, data)) {
+                if (!llSetting.equalVal(data)) {
                     e.setValue(new Preferences.ListListSetting(data));
                     return true;
@@ -129 +133 @@
             if (mlEditor.getValue() == 1) {
                 List<Map<String, String>> data = mlEditor.getData();
-                if (!Preferences.equalListOfStructs(mlSetting.getValue(), data)) {
+                if (!mlSetting.equalVal(data)) {
                     e.setValue(new Preferences.MapListSetting(data));
                     return true;
@@ -196 +200 @@
                 if (lEditor.getValue() == 1) {
                     List<String> data = lEditor.getData();
-                    if (!Preferences.equalCollection(lSetting.getValue(), data)) {
+                    if (!lSetting.equalVal(data)) {
                         pe.setValue(new Preferences.ListSetting(data));
                         ok = true;
@@ -208 +212 @@
                 if (llEditor.getValue() == 1) {
                     List<List<String>> data = llEditor.getData();
-                    @SuppressWarnings("unchecked")
-                    Collection<Collection<String>> llSettingValue = (Collection) llSetting.getValue();
-                    if (!Preferences.equalArray(llSettingValue, data)) {
+                    if (!llSetting.equalVal(data)) {
                         pe.setValue(new Preferences.ListListSetting(data));
                         ok = true;
@@ -222 +224 @@
                 if (mlEditor.getValue() == 1) {
                     List<Map<String, String>> data = mlEditor.getData();
-                    if (!Preferences.equalListOfStructs(mlSetting.getValue(), data)) {
+                    if (!mlSetting.equalVal(data)) {
                         pe.setValue(new Preferences.MapListSetting(data));
                         ok = true;