Ignore:
Timestamp:
2014-03-10T02:33:20+01:00 (10 years ago)
Author:
Don-vip
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java

    r6643 r6906  
    4040    private boolean canceled;
    4141
     42    /**
     43     * Constructs a new {@code ReadLocalPluginInformationTask}.
     44     */
    4245    public ReadLocalPluginInformationTask() {
    4346        super(tr("Reading local plugin information.."), false);
     
    7275    }
    7376
    74     protected void scanSiteCacheFiles(ProgressMonitor monitor, File pluginsDirectory) {
    75         File[] siteCacheFiles = pluginsDirectory.listFiles(
     77    private File[] listFiles(File pluginsDirectory, final String regex) {
     78        return pluginsDirectory.listFiles(
    7679                new FilenameFilter() {
    7780                    @Override
    7881                    public boolean accept(File dir, String name) {
    79                         return name.matches("^([0-9]+-)?site.*\\.txt$");
     82                        return name.matches(regex);
    8083                    }
    8184                }
    8285        );
     86    }
     87
     88    protected void scanSiteCacheFiles(ProgressMonitor monitor, File pluginsDirectory) {
     89        File[] siteCacheFiles = listFiles(pluginsDirectory, "^([0-9]+-)?site.*\\.txt$");
    8390        if (siteCacheFiles == null || siteCacheFiles.length == 0)
    8491            return;
     
    97104        }
    98105    }
    99 
    100106    protected void scanIconCacheFiles(ProgressMonitor monitor, File pluginsDirectory) {
    101         File[] siteCacheFiles = pluginsDirectory.listFiles(
    102                 new FilenameFilter() {
    103                     @Override
    104                     public boolean accept(File dir, String name) {
    105                         return name.matches("^([0-9]+-)?site.*plugin-icons\\.zip$");
    106                     }
    107                 }
    108         );
     107        File[] siteCacheFiles = listFiles(pluginsDirectory, "^([0-9]+-)?site.*plugin-icons\\.zip$");
    109108        if (siteCacheFiles == null || siteCacheFiles.length == 0)
    110109            return;
Note: See TracChangeset for help on using the changeset viewer.