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

Timestamp:

2010-08-29T14:55:25+02:00 (14 years ago)

Author:

jttt

Message:

cosmetics

File:

• trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java (modified) (13 diffs)

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

@@ -7 +7 @@
 import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.FilenameFilter;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -48 +48 @@
     private List<PluginInformation> availablePlugins;
 
-    protected enum CacheType {PLUGIN_LIST, ICON_LIST};
+    protected enum CacheType {PLUGIN_LIST, ICON_LIST}
 
     protected void init(Collection<String> sites){
@@ -60 +60 @@
     /**
      * Creates the task
-     * 
+     *
      * @param sites the collection of download sites. Defaults to the empty collection if null.
      */
@@ -70 +70 @@
     /**
      * Creates the task
-     * 
+     *
      * @param monitor the progress monitor. Defaults to {@see NullProgressMonitor#INSTANCE} if null
      * @param sites the collection of download sites. Defaults to the empty collection if null.
@@ -96 +96 @@
      * Creates the file name for the cached plugin list and the icon cache
      * file.
-     * 
+     *
      * @param site the name of the site
      * @param type icon cache or plugin list cache
@@ -122 +122 @@
             }
             switch (type) {
-                case PLUGIN_LIST:
-                    sb.append(".txt");
-                    break;
-                case ICON_LIST:
-                    sb.append("-icons.zip");
-                    break;
+            case PLUGIN_LIST:
+                sb.append(".txt");
+                break;
+            case ICON_LIST:
+                sb.append("-icons.zip");
+                break;
             }
             name = sb.toString();
@@ -138 +138 @@
     /**
      * Downloads the list from a remote location
-     * 
+     *
      * @param site the site URL
      * @param monitor a progress monitor
@@ -150 +150 @@
             String pl = Main.pref.getCollectionAsString("plugins");
             String printsite = site.replaceAll("%<(.*)>", "");
-            if(pl != null && pl.length() != 0)
+            if(pl != null && pl.length() != 0) {
                 site = site.replaceAll("%<(.*)>", "$1"+pl);
-            else
+            } else {
                 site = printsite;
+            }
 
             monitor.beginTask("");
@@ -257 +258 @@
     /**
      * Writes the list of plugins to a cache file
-     * 
+     *
      * @param site the site from where the list was downloaded
      * @param list the downloaded list
@@ -288 +289 @@
      * Filter information about deprecated plugins from the list of downloaded
      * plugins
-     * 
+     *
      * @param plugins the plugin informations
      * @return the plugin informations, without deprecated plugins
@@ -306 +307 @@
     /**
      * Parses the plugin list
-     * 
+     *
      * @param site the site from where the list was downloaded
      * @param doc the document with the plugin list
@@ -335 +336 @@
         for (String location : PluginInformation.getPluginLocations()) {
             File [] f = new File(location).listFiles(
-                new FilenameFilter() {
-                    public boolean accept(File dir, String name) {
-                        return name.matches("^([0-9]+-)?site.*\\.txt$") ||
-                               name.matches("^([0-9]+-)?site.*-icons\\.zip$");
+                    new FilenameFilter() {
+                        public boolean accept(File dir, String name) {
+                            return name.matches("^([0-9]+-)?site.*\\.txt$") ||
+                            name.matches("^([0-9]+-)?site.*-icons\\.zip$");
+                        }
                     }
-                }
             );
-            if(f != null && f.length > 0)
+            if(f != null && f.length > 0) {
                 siteCacheFiles.addAll(Arrays.asList(f));
+            }
         }
 
@@ -382 +384 @@
     /**
      * Replies the list of plugins described in the downloaded plugin lists
-     * 
+     *
      * @return  the list of plugins
      */