Changeset 16845 in josm for trunk

Timestamp:

2020-08-03T23:09:11+02:00 (4 years ago)

Author:

simon04

Message:

AdvancedPreference: remove code duplication

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java (modified) (1 diff)

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

@@ -412 +412 @@
             public void menuSelected(MenuEvent me) {
                 p.removeAll();
-                File[] files = new File(".").listFiles();
+                load(p, new File(".").listFiles());
+                load(p, Config.getDirs().getPreferencesDirectory(false).listFiles());
+            }
+
+            private void load(JMenu p, File[] files) {
                 if (files != null) {
-                    for (File f: files) {
-                       String s = f.getName();
-                       int idx = s.indexOf('_');
-                       if (idx >= 0) {
+                    for (File f : files) {
+                        String s = f.getName();
+                        int idx = s.indexOf('_');
+                        if (idx >= 0) {
                             String t = s.substring(0, idx);
                             if (profileTypes.containsKey(t)) {
                                 p.add(new ImportProfileAction(s, f, t));
                             }
-                       }
-                    }
-                }
-                files = Config.getDirs().getPreferencesDirectory(false).listFiles();
-                if (files != null) {
-                    for (File f: files) {
-                       String s = f.getName();
-                       int idx = s.indexOf('_');
-                       if (idx >= 0) {
-                            String t = s.substring(0, idx);
-                            if (profileTypes.containsKey(t)) {
-                                p.add(new ImportProfileAction(s, f, t));
-                            }
-                       }
+                        }
                     }
                 }