Revision: 6476
http://sourceforge.net/p/jump-pilot/code/6476
Author: edso
Date: 2020-09-14 11:37:22 +0000 (Mon, 14 Sep 2020)
Log Message:
-----------
replace deprecated PlugInManager.milliSecondsSince() and friends with Timer
class equivalents
Modified Paths:
--------------
core/trunk/src/com/vividsolutions/jump/workbench/JUMPWorkbench.java
core/trunk/src/com/vividsolutions/jump/workbench/plugin/PlugInManager.java
Modified: core/trunk/src/com/vividsolutions/jump/workbench/JUMPWorkbench.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/JUMPWorkbench.java
2020-09-14 11:00:47 UTC (rev 6475)
+++ core/trunk/src/com/vividsolutions/jump/workbench/JUMPWorkbench.java
2020-09-14 11:37:22 UTC (rev 6476)
@@ -72,6 +72,7 @@
import com.vividsolutions.jump.util.Blackboard;
import com.vividsolutions.jump.util.LangUtil;
import com.vividsolutions.jump.util.StringUtil;
+import com.vividsolutions.jump.util.Timer;
import com.vividsolutions.jump.util.commandline.CommandLine;
import com.vividsolutions.jump.util.commandline.Option;
import com.vividsolutions.jump.util.commandline.OptionSpec;
@@ -322,7 +323,7 @@
}
public static void main(String[] args) {
- long start = PlugInManager.milliSecondsSince(0);
+ long start = Timer.milliSecondsSince(0);
try {
// first fetch parameters, locale might be changed with -i18n switch
parseCommandLine(args);
@@ -385,7 +386,7 @@
main(args, I18N.get("JUMPWorkbench.jump"), splashPanel, progressMonitor);
Logger.info("OJ start took "
- + PlugInManager.secondsSinceString(start) + "s alltogether.");
+ + Timer.secondsSinceString(start) + "s alltogether.");
} catch (final Throwable t) {
try {
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/plugin/PlugInManager.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/plugin/PlugInManager.java
2020-09-14 11:00:47 UTC (rev 6475)
+++ core/trunk/src/com/vividsolutions/jump/workbench/plugin/PlugInManager.java
2020-09-14 11:37:22 UTC (rev 6476)
@@ -181,19 +181,19 @@
// Find the configurations right away so they get reported to the splash
// screen ASAP. [Jon Aquino]
if (plugInDirectory != null) {
- start = milliSecondsSince(0);
+ start = Timer.milliSecondsSince(0);
configurations.addAll(findConfigurations(plugInDirectory));
Logger.info("Finding all OJ extensions took "
- + secondsSinceString(start) + "s");
+ + Timer.secondsSinceString(start) + "s");
}
configurations.addAll(findConfigurations(context.getWorkbench()
.getProperties().getConfigurationClassNames()));
- start = milliSecondsSince(0);
+ start = Timer.milliSecondsSince(0);
loadConfigurations();
Logger.info("Loading all OJ extensions took "
- + secondsSinceString(start) + "s");
+ + Timer.secondsSinceString(start) + "s");
// enable autoseparating in installer for plugins possibly installed
later on
FeatureInstaller.getInstance().setSeparatingEnabled(true);
@@ -208,13 +208,13 @@
Configuration configuration = (Configuration) i.next();
monitor.report(I18N.get(LOADING) + " " + name(configuration) + " "
+ version(configuration));
- long start = milliSecondsSince(0);
+ long start = Timer.milliSecondsSince(0);
try {
// we used the plugin classloader to instantiate extensions already
above
configuration.configure(pc);
//System.out.println(Arrays.toString(((URLClassLoader)classLoader).getURLs()));
Logger.info("Loading Config " + name(configuration) + " "
- + version(configuration) + " took " + secondsSinceString(start)
+ + version(configuration) + " took " +
Timer.secondsSinceString(start)
+ "s");
}
catch (Throwable e) {
@@ -243,7 +243,7 @@
Class plugInClass = null;
try {
- long start = milliSecondsSince(0);
+ long start = Timer.milliSecondsSince(0);
// make sure we use the plugin classloader for plugins
plugInClass = classLoader.loadClass(className);
@@ -306,7 +306,7 @@
.getWorkbench()
.getFrame()
.log(
- "Loading Plugin " + className + " took " +
secondsSinceString(start)
+ "Loading Plugin " + className + " took " +
Timer.secondsSinceString(start)
+ "s " );
} catch (Throwable e) {
@@ -317,26 +317,6 @@
}
}
- /**
- * a helper method to measure time frames in milliseconds
- * @param i
- * @deprecated use utility class Timer instead
- */
- @Deprecated
- public static long milliSecondsSince( long i ){
- return Timer.milliSecondsSince(i);
- }
-
- /**
- * a helper method to nicely format the above output e.g. 12046ms -> 12.05s
- * @param i
- * @deprecated use utility class Timer instead
- */
- @Deprecated
- public static String secondsSinceString( long i ){
- return Timer.secondsSinceString(i);
- }
-
public static String name(Configuration configuration) {
if (configuration instanceof Extension) {
return ((Extension) configuration).getName();
@@ -417,7 +397,7 @@
ArrayList configurations = new ArrayList();
long start;
for (Iterator i = findFilesRecursively( plugInDirectory, false
).iterator(); i.hasNext();) {
- start = milliSecondsSince(0);
+ start = Timer.milliSecondsSince(0);
File file = (File) i.next();
String msg = I18N.getMessage(
"com.vividsolutions.jump.workbench.plugin.PlugInManager.scan",
@@ -429,7 +409,7 @@
} catch (ZipException e) {
// Might not be a zipfile. Eat it. [Jon Aquino]
}
- Logger.info("Scanning " + file + " took " + secondsSinceString(start)
+ Logger.info("Scanning " + file + " took " +
Timer.secondsSinceString(start)
+ "s");
}
_______________________________________________
Jump-pilot-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
