Changeset 10121 in josm
- Timestamp:
- 2016-04-08T19:52:27+02:00 (9 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/SplashScreen.java
r10117 r10121 225 225 public void beginTask(String title) { 226 226 if (title != null) { 227 if (Main.isDebugEnabled()) { 228 Main.debug(title); 229 } 227 230 final MeasurableTask task = new MeasurableTask(title); 228 231 tasks.add(task); … … 283 286 if (task instanceof MeasurableTask) { 284 287 ((MeasurableTask) task).finish(); 285 Main.debug(tr("{0} completed in {1}", title, ((MeasurableTask) task).duration)); 288 if (Main.isDebugEnabled()) { 289 Main.debug(tr("{0} completed in {1}", title, ((MeasurableTask) task).duration)); 290 } 286 291 listener.stateChanged(null); 287 292 } -
trunk/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java
r6362 r10121 6 6 import org.openstreetmap.josm.Main; 7 7 8 /** 9 * A singleton progress monitor that does nothing. 10 * @since 1811 11 */ 8 12 public final class NullProgressMonitor implements ProgressMonitor { 9 13 14 /** The unique instance */ 10 15 public static final ProgressMonitor INSTANCE = new NullProgressMonitor(); 11 16 … … 20 25 @Override 21 26 public void beginTask(String title) { 27 if (Main.isDebugEnabled()) { 28 Main.debug(title); 29 } 22 30 } 23 31 24 32 @Override 25 33 public void beginTask(String title, int ticks) { 34 if (Main.isDebugEnabled()) { 35 Main.debug(title); 36 } 26 37 } 27 38 … … 50 61 @Override 51 62 public void indeterminateSubTask(String title) { 63 if (Main.isDebugEnabled()) { 64 Main.debug(title); 65 } 52 66 } 53 67 … … 93 107 @Override 94 108 public void subTask(String title) { 109 if (Main.isDebugEnabled()) { 110 Main.debug(title); 111 } 95 112 } 96 113 -
trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
r10093 r10121 881 881 try { 882 882 monitor.beginTask(tr("Determine plugins to load...")); 883 Set<String> plugins = new HashSet<>(); 884 plugins.addAll(Main.pref.getCollection("plugins", new LinkedList<String>())); 885 if (System.getProperty("josm.plugins") != null) { 886 plugins.addAll(Arrays.asList(System.getProperty("josm.plugins").split(","))); 883 Set<String> plugins = new HashSet<>(Main.pref.getCollection("plugins", new LinkedList<String>())); 884 if (Main.isDebugEnabled()) { 885 Main.debug("Plugins list initialized to " + plugins); 886 } 887 String systemProp = System.getProperty("josm.plugins"); 888 if (systemProp != null) { 889 plugins.addAll(Arrays.asList(systemProp.split(","))); 890 if (Main.isDebugEnabled()) { 891 Main.debug("josm.plugins system property set to '" + systemProp+"'. Plugins list is now " + plugins); 892 } 887 893 } 888 894 monitor.subTask(tr("Removing deprecated plugins...")); … … 890 896 monitor.subTask(tr("Removing unmaintained plugins...")); 891 897 filterUnmaintainedPlugins(parent, plugins); 898 if (Main.isDebugEnabled()) { 899 Main.debug("Plugins list is finally set to " + plugins); 900 } 892 901 Map<String, PluginInformation> infos = loadLocallyAvailablePluginInformation(monitor.createSubTaskMonitor(1, false)); 893 902 List<PluginInformation> ret = new LinkedList<>(); -
trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java
r10093 r10121 39 39 try { 40 40 System.setProperty("josm.plugins", "buildings_tools,plastic_laf"); 41 assertEquals("buildings_tools,plastic_laf", System.getProperty("josm.plugins")); 41 42 SplashProgressMonitor monitor = new SplashProgressMonitor("foo", new ChangeListener() { 42 43 @Override … … 46 47 }); 47 48 Collection<PluginInformation> plugins = MainApplication.updateAndLoadEarlyPlugins(null, monitor); 49 assertEquals("buildings_tools,plastic_laf", System.getProperty("josm.plugins")); 48 50 assertEquals(2, plugins.size()); 49 51 assertNotNull(PluginHandler.getPlugin("plastic_laf"));
Note:
See TracChangeset
for help on using the changeset viewer.