Changeset 6906 in josm for trunk/src/org/openstreetmap/josm/plugins

Timestamp:

2014-03-10T02:33:20+01:00 (11 years ago)

Author:

Don-vip

Message:

refactor duplicated code - impacts some plugins (reverter, roadsigns, cmdline)

File:

• trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java

@@ -40 +40 @@
     private boolean canceled;
 
+    /**
+     * Constructs a new {@code ReadLocalPluginInformationTask}.
+     */
     public ReadLocalPluginInformationTask() {
         super(tr("Reading local plugin information.."), false);
@@ -72 +75 @@
     }
 
-    protected void scanSiteCacheFiles(ProgressMonitor monitor, File pluginsDirectory) {
-        File[] siteCacheFiles = pluginsDirectory.listFiles(
+    private File[] listFiles(File pluginsDirectory, final String regex) {
+        return pluginsDirectory.listFiles(
                 new FilenameFilter() {
                     @Override
                     public boolean accept(File dir, String name) {
-                        return name.matches("^([0-9]+-)?site.*\\.txt$");
+                        return name.matches(regex);
                     }
                 }
         );
+    }
+
+    protected void scanSiteCacheFiles(ProgressMonitor monitor, File pluginsDirectory) {
+        File[] siteCacheFiles = listFiles(pluginsDirectory, "^([0-9]+-)?site.*\\.txt$");
         if (siteCacheFiles == null || siteCacheFiles.length == 0)
             return;
@@ -97 +104 @@
         }
     }
-
     protected void scanIconCacheFiles(ProgressMonitor monitor, File pluginsDirectory) {
-        File[] siteCacheFiles = pluginsDirectory.listFiles(
-                new FilenameFilter() {
-                    @Override
-                    public boolean accept(File dir, String name) {
-                        return name.matches("^([0-9]+-)?site.*plugin-icons\\.zip$");
-                    }
-                }
-        );
+        File[] siteCacheFiles = listFiles(pluginsDirectory, "^([0-9]+-)?site.*plugin-icons\\.zip$");
         if (siteCacheFiles == null || siteCacheFiles.length == 0)
             return;