Ignore:
Timestamp:
2013-07-17T00:01:49+02:00 (7 years ago)
Author:
stoecker
Message:

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

Location:
trunk/src/org/openstreetmap/josm/plugins
Files:
2 edited

Legend:

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

    r6041 r6070  
    151151
    152152    final public static String [] UNMAINTAINED_PLUGINS = new String[] {"gpsbabelgui", "Intersect_way"};
    153    
     153
    154154    /**
    155155     * Default time-based update interval, in days (pluginmanager.time-based-update.interval)
     
    425425            return false;
    426426        }
    427        
     427
    428428        // Add all plugins already loaded (to include early plugins when checking late ones)
    429429        Collection<PluginInformation> allPlugins = new HashSet<PluginInformation>(plugins);
     
    449449
    450450        String requires = local ? plugin.localrequires : plugin.requires;
    451        
     451
    452452        // make sure the dependencies to other plugins are not broken
    453453        //
     
    483483        List<URL> allPluginLibraries = new LinkedList<URL>();
    484484        File pluginDir = Main.pref.getPluginsDirectory();
    485        
     485
    486486        // Add all plugins already loaded (to include early plugins in the classloader, allowing late plugins to rely on early ones)
    487487        Collection<PluginInformation> allPlugins = new HashSet<PluginInformation>(plugins);
     
    489489            allPlugins.add(proxy.getPluginInformation());
    490490        }
    491        
     491
    492492        for (PluginInformation info : allPlugins) {
    493493            if (info.libraries == null) {
     
    760760        );
    761761    }
    762    
     762
    763763    private static Set<PluginInformation> findRequiredPluginsToDownload(
    764764            Collection<PluginInformation> pluginsToUpdate, List<PluginInformation> allPlugins, Set<PluginInformation> pluginsToDownload) {
     
    818818            Future<?> future = service.submit(task1);
    819819            List<PluginInformation> allPlugins = null;
    820            
     820
    821821            try {
    822822                future.get();
     
    841841                }
    842842            }
    843            
     843
    844844            if (!pluginsToUpdate.isEmpty()) {
    845                
     845
    846846                Set<PluginInformation> pluginsToDownload = new HashSet<PluginInformation>(pluginsToUpdate);
    847                
     847
    848848                if (allPlugins != null) {
    849849                    // Updated plugins may need additional plugin dependencies currently not installed
     
    851851                    Set<PluginInformation> additionalPlugins = findRequiredPluginsToDownload(pluginsToUpdate, allPlugins, pluginsToDownload);
    852852                    pluginsToDownload.addAll(additionalPlugins);
    853                    
     853
    854854                    // Iterate on required plugins, if they need themselves another plugins (i.e A needs B, but B needs C)
    855855                    while (!additionalPlugins.isEmpty()) {
     
    881881                    return plugins;
    882882                }
    883                
     883
    884884                // Update Plugin info for downloaded plugins
    885885                //
    886886                refreshLocalUpdatedPluginInfo(task2.getDownloadedPlugins());
    887                
     887
    888888                // notify user if downloading a locally installed plugin failed
    889889                //
     
    10051005        return;
    10061006    }
    1007    
     1007
    10081008    /**
    10091009     * Determines if the specified file is a valid and accessible JAR file.
     
    10231023        return false;
    10241024    }
    1025    
     1025
    10261026    /**
    10271027     * Replies the updated jar file for the given plugin name.
     
    10431043        return downloadedPluginFile;
    10441044    }
    1045    
     1045
    10461046    /**
    10471047     * Refreshes the given PluginInformation objects with new contents read from their corresponding jar file.
  • trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java

    r5874 r6070  
    5858    public List<URL> libraries = new LinkedList<URL>();
    5959    public final Map<String, String> attr = new TreeMap<String, String>();
    60    
     60
    6161    private static final ImageIcon emptyIcon = new ImageIcon(new BufferedImage(24, 24, BufferedImage.TYPE_INT_ARGB));
    6262
     
    154154        this.attr.putAll(other.attr);
    155155    }
    156    
     156
    157157    /**
    158158     * Updates the plugin information of this plugin information object with the
     
    173173        this.stage = other.stage;
    174174    }
    175    
     175
    176176    private void scanManifest(Manifest manifest, boolean oldcheck){
    177177        String lang = LanguageInfo.getLanguageCodeManifest();
     
    495495        return requiredPlugins;
    496496    }
    497    
    498     /**
    499      * Replies the list of plugins required by the up-to-date version of this plugin. 
     497
     498    /**
     499     * Replies the list of plugins required by the up-to-date version of this plugin.
    500500     * @return List of plugins required. Empty if no plugin is required.
    501501     * @since 5601
     
    504504        return getRequiredPlugins(requires);
    505505    }
    506    
    507     /**
    508      * Replies the list of plugins required by the local instance of this plugin. 
     506
     507    /**
     508     * Replies the list of plugins required by the local instance of this plugin.
    509509     * @return List of plugins required. Empty if no plugin is required.
    510510     * @since 5601
     
    513513        return getRequiredPlugins(localrequires);
    514514    }
    515    
    516     /**
    517      * Updates the local fields ({@link #localversion}, {@link #localmainversion}, {@link #localrequires}) 
    518      * to values contained in the up-to-date fields ({@link #version}, {@link #mainversion}, {@link #requires}) 
     515
     516    /**
     517     * Updates the local fields ({@link #localversion}, {@link #localmainversion}, {@link #localrequires})
     518     * to values contained in the up-to-date fields ({@link #version}, {@link #mainversion}, {@link #requires})
    519519     * of the given PluginInformation.
    520520     * @param info The plugin information to get the data from.
Note: See TracChangeset for help on using the changeset viewer.