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

Timestamp:

2013-07-17T00:01:49+02:00 (10 years ago)

Author:

stoecker

Message:

see #8853 remove tabs, trailing spaces, windows line ends, strange characters

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• PluginHandler.java (modified) (13 diffs)
• PluginInformation.java (modified) (6 diffs)

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

@@ -151 +151 @@
 
     final public static String [] UNMAINTAINED_PLUGINS = new String[] {"gpsbabelgui", "Intersect_way"};
-    
+
     /**
      * Default time-based update interval, in days (pluginmanager.time-based-update.interval)
@@ -425 +425 @@
             return false;
         }
-        
+
         // Add all plugins already loaded (to include early plugins when checking late ones)
         Collection<PluginInformation> allPlugins = new HashSet<PluginInformation>(plugins);
@@ -449 +449 @@
 
         String requires = local ? plugin.localrequires : plugin.requires;
-        
+
         // make sure the dependencies to other plugins are not broken
         //
@@ -483 +483 @@
         List<URL> allPluginLibraries = new LinkedList<URL>();
         File pluginDir = Main.pref.getPluginsDirectory();
-        
+
         // Add all plugins already loaded (to include early plugins in the classloader, allowing late plugins to rely on early ones)
         Collection<PluginInformation> allPlugins = new HashSet<PluginInformation>(plugins);
@@ -489 +489 @@
             allPlugins.add(proxy.getPluginInformation());
         }
-        
+
         for (PluginInformation info : allPlugins) {
             if (info.libraries == null) {
@@ -760 +760 @@
         );
     }
-    
+
     private static Set<PluginInformation> findRequiredPluginsToDownload(
             Collection<PluginInformation> pluginsToUpdate, List<PluginInformation> allPlugins, Set<PluginInformation> pluginsToDownload) {
@@ -818 +818 @@
             Future<?> future = service.submit(task1);
             List<PluginInformation> allPlugins = null;
-            
+
             try {
                 future.get();
@@ -841 +841 @@
                 }
             }
-            
+
             if (!pluginsToUpdate.isEmpty()) {
-                
+
                 Set<PluginInformation> pluginsToDownload = new HashSet<PluginInformation>(pluginsToUpdate);
-                
+
                 if (allPlugins != null) {
                     // Updated plugins may need additional plugin dependencies currently not installed
@@ -851 +851 @@
                     Set<PluginInformation> additionalPlugins = findRequiredPluginsToDownload(pluginsToUpdate, allPlugins, pluginsToDownload);
                     pluginsToDownload.addAll(additionalPlugins);
-                    
+
                     // Iterate on required plugins, if they need themselves another plugins (i.e A needs B, but B needs C)
                     while (!additionalPlugins.isEmpty()) {
@@ -881 +881 @@
                     return plugins;
                 }
-                
+
                 // Update Plugin info for downloaded plugins
                 //
                 refreshLocalUpdatedPluginInfo(task2.getDownloadedPlugins());
-                
+
                 // notify user if downloading a locally installed plugin failed
                 //
@@ -1005 +1005 @@
         return;
     }
-    
+
     /**
      * Determines if the specified file is a valid and accessible JAR file.
@@ -1023 +1023 @@
         return false;
     }
-    
+
     /**
      * Replies the updated jar file for the given plugin name.
@@ -1043 +1043 @@
         return downloadedPluginFile;
     }
-    
+
     /**
      * Refreshes the given PluginInformation objects with new contents read from their corresponding jar file.

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

@@ -58 +58 @@
     public List<URL> libraries = new LinkedList<URL>();
     public final Map<String, String> attr = new TreeMap<String, String>();
-    
+
     private static final ImageIcon emptyIcon = new ImageIcon(new BufferedImage(24, 24, BufferedImage.TYPE_INT_ARGB));
 
@@ -154 +154 @@
         this.attr.putAll(other.attr);
     }
-    
+
     /**
      * Updates the plugin information of this plugin information object with the
@@ -173 +173 @@
         this.stage = other.stage;
     }
-    
+
     private void scanManifest(Manifest manifest, boolean oldcheck){
         String lang = LanguageInfo.getLanguageCodeManifest();
@@ -495 +495 @@
         return requiredPlugins;
     }
-    
-    /**
-     * Replies the list of plugins required by the up-to-date version of this plugin. 
+
+    /**
+     * Replies the list of plugins required by the up-to-date version of this plugin.
      * @return List of plugins required. Empty if no plugin is required.
      * @since 5601
@@ -504 +504 @@
         return getRequiredPlugins(requires);
     }
-    
-    /**
-     * Replies the list of plugins required by the local instance of this plugin. 
+
+    /**
+     * Replies the list of plugins required by the local instance of this plugin.
      * @return List of plugins required. Empty if no plugin is required.
      * @since 5601
@@ -513 +513 @@
         return getRequiredPlugins(localrequires);
     }
-    
-    /**
-     * Updates the local fields ({@link #localversion}, {@link #localmainversion}, {@link #localrequires}) 
-     * to values contained in the up-to-date fields ({@link #version}, {@link #mainversion}, {@link #requires}) 
+
+    /**
+     * Updates the local fields ({@link #localversion}, {@link #localmainversion}, {@link #localrequires})
+     * to values contained in the up-to-date fields ({@link #version}, {@link #mainversion}, {@link #requires})
      * of the given PluginInformation.
      * @param info The plugin information to get the data from.