Changeset 12841 in josm for trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
- Timestamp:
- 2017-09-13T16:30:27+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
r12639 r12841 422 422 String togglePreferenceKey = null; 423 423 int v = Version.getInstance().getVersion(); 424 if (Main.pref.getInt eger("pluginmanager.version", 0) < v) {424 if (Main.pref.getInt("pluginmanager.version", 0) < v) { 425 425 message = 426 426 "<html>" … … 434 434 long tim = System.currentTimeMillis(); 435 435 long last = Main.pref.getLong("pluginmanager.lastupdate", 0); 436 Integer maxTime = Main.pref.getInt eger("pluginmanager.time-based-update.interval", DEFAULT_TIME_BASED_UPDATE_INTERVAL);436 Integer maxTime = Main.pref.getInt("pluginmanager.time-based-update.interval", DEFAULT_TIME_BASED_UPDATE_INTERVAL); 437 437 long d = TimeUnit.MILLISECONDS.toDays(tim - last); 438 438 if ((last <= 0) || (maxTime <= 0)) { … … 607 607 if (!task.getDownloadedPlugins().isEmpty()) { 608 608 // update plugin list in preferences 609 Set<String> plugins = new HashSet<>(Main.pref.get Collection("plugins"));609 Set<String> plugins = new HashSet<>(Main.pref.getList("plugins")); 610 610 for (PluginInformation plugin : task.getDownloadedPlugins()) { 611 611 plugins.add(plugin.name); 612 612 } 613 Main.pref.put Collection("plugins", plugins);613 Main.pref.putList("plugins", new ArrayList<>(plugins)); 614 614 // restart 615 615 try { … … 969 969 try { 970 970 monitor.beginTask(tr("Determining plugins to load...")); 971 Set<String> plugins = new HashSet<>(Main.pref.get Collection("plugins", new LinkedList<String>()));971 Set<String> plugins = new HashSet<>(Main.pref.getList("plugins", new LinkedList<String>())); 972 972 Logging.debug("Plugins list initialized to {0}", plugins); 973 973 String systemProp = System.getProperty("josm.plugins"); … … 1157 1157 if (pluginsWanted == null) { 1158 1158 // if all plugins updated, remember the update because it was successful 1159 Main.pref.putInt eger("pluginmanager.version", Version.getInstance().getVersion());1159 Main.pref.putInt("pluginmanager.version", Version.getInstance().getVersion()); 1160 1160 Main.pref.put("pluginmanager.lastupdate", Long.toString(System.currentTimeMillis())); 1161 1161 } … … 1450 1450 return null; 1451 1451 1452 Set<String> plugins = new HashSet<>( 1453 Main.pref.getCollection("plugins", Collections.<String>emptySet()) 1454 ); 1452 Set<String> plugins = new HashSet<>(Main.pref.getList("plugins")); 1455 1453 final PluginInformation pluginInfo = plugin.getPluginInformation(); 1456 1454 if (!plugins.contains(pluginInfo.name)) … … 1467 1465 // deactivate the plugin 1468 1466 plugins.remove(plugin.getPluginInformation().name); 1469 Main.pref.put Collection("plugins", plugins);1467 Main.pref.putList("plugins", new ArrayList<>(plugins)); 1470 1468 GuiHelper.runInEDTAndWait(() -> JOptionPane.showMessageDialog( 1471 1469 Main.parent, … … 1486 1484 */ 1487 1485 public static Collection<String> getBugReportInformation() { 1488 final Collection<String> pl = new TreeSet<>(Main.pref.get Collection("plugins", new LinkedList<>()));1486 final Collection<String> pl = new TreeSet<>(Main.pref.getList("plugins", new LinkedList<>())); 1489 1487 for (final PluginProxy pp : pluginList) { 1490 1488 PluginInformation pi = pp.getPluginInformation();
Note:
See TracChangeset
for help on using the changeset viewer.