Changeset 10035 in josm for trunk/src/org/openstreetmap/josm/gui/preferences

Timestamp:

2016-03-23T22:36:15+01:00 (8 years ago)

Author:

Don-vip

Message:

code refactoring to ease creation of unit tests by avoiding as much as possible HeadlessException

Location:

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

Files:

• PreferenceDialog.java (modified) (2 diffs)
• SourceEditor.java (modified) (2 diffs)
• advanced/PreferencesTable.java (modified) (3 diffs)
• plugin/PluginPreference.java (modified) (3 diffs)

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

@@ -22 +22 @@
 import javax.swing.JComponent;
 import javax.swing.JDialog;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.KeyStroke;
@@ -79 +78 @@
 
     public PreferenceDialog(Component parent) {
-        super(JOptionPane.getFrameForComponent(parent), tr("Preferences"), ModalityType.DOCUMENT_MODAL);
+        super(GuiHelper.getFrameForComponent(parent), tr("Preferences"), ModalityType.DOCUMENT_MODAL);
         build();
         this.setMinimumSize(new Dimension(600, 350));

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

@@ -904 +904 @@
                         .createFileChooser(true, null, Arrays.asList(ff, FileFilterAllFiles.getInstance()), ff, JFileChooser.FILES_ONLY);
                 prepareFileChooser(tfURL.getText(), fcm.getFileChooser());
-                AbstractFileChooser fc = fcm.openFileChooser(JOptionPane.getFrameForComponent(SourceEditor.this));
+                AbstractFileChooser fc = fcm.openFileChooser(GuiHelper.getFrameForComponent(SourceEditor.this));
                 if (fc != null) {
                     tfURL.setText(fc.getSelectedFile().toString());
@@ -1634 +1634 @@
                 }
                 prepareFileChooser(tfFileName.getText(), fcm.getFileChooser());
-                AbstractFileChooser fc = fcm.openFileChooser(JOptionPane.getFrameForComponent(SourceEditor.this));
+                AbstractFileChooser fc = fcm.openFileChooser(GuiHelper.getFrameForComponent(SourceEditor.this));
                 if (fc != null) {
                     tfFileName.setText(fc.getSelectedFile().toString());

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

@@ -105 +105 @@
         final PrefEntry e = (PrefEntry) model.getValueAt(getSelectedRow(), 1);
         Setting<?> stg = e.getValue();
+        boolean ok = false;
         if (stg instanceof StringSetting) {
             editCellAt(getSelectedRow(), 1);
@@ -112 +113 @@
             }
         } 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 (!lSetting.equalVal(data)) {
-                    e.setValue(new ListSetting(data));
-                    return true;
-                }
-            }
+            ok = doEditList(gui, e, (ListSetting) stg);
         } else if (stg instanceof ListListSetting) {
-            ListListSetting llSetting = (ListListSetting) stg;
-            ListListEditor llEditor = new ListListEditor(gui, e, llSetting);
-            llEditor.showDialog();
-            if (llEditor.getValue() == 1) {
-                List<List<String>> data = llEditor.getData();
-                if (!llSetting.equalVal(data)) {
-                    e.setValue(new ListListSetting(data));
-                    return true;
-                }
-            }
+            ok = doEditListList(gui, e, (ListListSetting) stg);
         } 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 (!mlSetting.equalVal(data)) {
-                    e.setValue(new MapListSetting(data));
-                    return true;
-                }
+            ok = doEditMapList(gui, e, (MapListSetting) stg);
+        }
+        return ok;
+    }
+
+    static boolean doEditList(final JComponent gui, final PrefEntry e, ListSetting lSetting) {
+        ListEditor lEditor = new ListEditor(gui, e, lSetting);
+        lEditor.showDialog();
+        if (lEditor.getValue() == 1) {
+            List<String> data = lEditor.getData();
+            if (!lSetting.equalVal(data)) {
+                e.setValue(new ListSetting(data));
+                return true;
+            }
+        }
+        return false;
+    }
+
+    static boolean doEditListList(final JComponent gui, final PrefEntry e, ListListSetting llSetting) {
+        ListListEditor llEditor = new ListListEditor(gui, e, llSetting);
+        llEditor.showDialog();
+        if (llEditor.getValue() == 1) {
+            List<List<String>> data = llEditor.getData();
+            if (!llSetting.equalVal(data)) {
+                e.setValue(new ListListSetting(data));
+                return true;
+            }
+        }
+        return false;
+    }
+
+    static boolean doEditMapList(final JComponent gui, final PrefEntry e, MapListSetting mlSetting) {
+        MapListEditor mlEditor = new MapListEditor(gui, e, mlSetting);
+        mlEditor.showDialog();
+        if (mlEditor.getValue() == 1) {
+            List<Map<String, String>> data = mlEditor.getData();
+            if (!mlSetting.equalVal(data)) {
+                e.setValue(new MapListSetting(data));
+                return true;
             }
         }
@@ -190 +203 @@
                 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 (!Objects.equals(sSetting.getValue(), data)) {
-                        pe.setValue(new StringSetting(data));
-                        ok = true;
-                    }
-                }
+                ok = doAddSimple(gui, pe, sSetting);
             } 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 (!lSetting.equalVal(data)) {
-                        pe.setValue(new ListSetting(data));
-                        ok = true;
-                    }
-                }
+                ok = doAddList(gui, pe, lSetting);
             } 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 (!llSetting.equalVal(data)) {
-                        pe.setValue(new ListListSetting(data));
-                        ok = true;
-                    }
-                }
+                ok = doAddListList(gui, pe, llSetting);
             } 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 (!mlSetting.equalVal(data)) {
-                        pe.setValue(new MapListSetting(data));
-                        ok = true;
-                    }
-                }
-            }
-        }
-        if (ok)
-            return pe;
-        else
-            return null;
+                ok = doAddMapList(gui, pe, mlSetting);
+            }
+        }
+        return ok ? pe : null;
+    }
+
+    static boolean doAddSimple(final JComponent gui, PrefEntry pe, StringSetting sSetting) {
+        StringEditor sEditor = new StringEditor(gui, pe, sSetting);
+        sEditor.showDialog();
+        if (sEditor.getValue() == 1) {
+            String data = sEditor.getData();
+            if (!Objects.equals(sSetting.getValue(), data)) {
+                pe.setValue(new StringSetting(data));
+                return true;
+            }
+        }
+        return false;
+    }
+
+    static boolean doAddList(final JComponent gui, PrefEntry pe, ListSetting lSetting) {
+        ListEditor lEditor = new ListEditor(gui, pe, lSetting);
+        lEditor.showDialog();
+        if (lEditor.getValue() == 1) {
+            List<String> data = lEditor.getData();
+            if (!lSetting.equalVal(data)) {
+                pe.setValue(new ListSetting(data));
+                return true;
+            }
+        }
+        return false;
+    }
+
+    static boolean doAddListList(final JComponent gui, PrefEntry pe, ListListSetting llSetting) {
+        ListListEditor llEditor = new ListListEditor(gui, pe, llSetting);
+        llEditor.showDialog();
+        if (llEditor.getValue() == 1) {
+            List<List<String>> data = llEditor.getData();
+            if (!llSetting.equalVal(data)) {
+                pe.setValue(new ListListSetting(data));
+                return true;
+            }
+        }
+        return false;
+    }
+
+    static boolean doAddMapList(final JComponent gui, PrefEntry pe, MapListSetting mlSetting) {
+        MapListEditor mlEditor = new MapListEditor(gui, pe, mlSetting);
+        mlEditor.showDialog();
+        if (mlEditor.getValue() == 1) {
+            List<Map<String, String>> data = mlEditor.getData();
+            if (!mlSetting.equalVal(data)) {
+                pe.setValue(new MapListSetting(data));
+                return true;
+            }
+        }
+        return false;
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java

@@ -543 +543 @@
                 public void actionPerformed(ActionEvent e) {
                     String s = JOptionPane.showInputDialog(
-                            JOptionPane.getFrameForComponent(PluginConfigurationSitesPanel.this),
+                            GuiHelper.getFrameForComponent(PluginConfigurationSitesPanel.this),
                             tr("Add JOSM Plugin description URL."),
                             tr("Enter URL"),
@@ -558 +558 @@
                     if (list.getSelectedValue() == null) {
                         JOptionPane.showMessageDialog(
-                                JOptionPane.getFrameForComponent(PluginConfigurationSitesPanel.this),
+                                GuiHelper.getFrameForComponent(PluginConfigurationSitesPanel.this),
                                 tr("Please select an entry."),
                                 tr("Warning"),
@@ -584 +584 @@
                     if (list.getSelectedValue() == null) {
                         JOptionPane.showMessageDialog(
-                                JOptionPane.getFrameForComponent(PluginConfigurationSitesPanel.this),
+                                GuiHelper.getFrameForComponent(PluginConfigurationSitesPanel.this),
                                 tr("Please select an entry."),
                                 tr("Warning"),