ImageJ2Options: use initializer for log level

stelfrich · ctrueden · commit 313a747b89c1 · 2017-01-01T10:23:30.000-06:00
diff --git a/src/main/java/net/imagej/legacy/ImageJ2Options.java b/src/main/java/net/imagej/legacy/ImageJ2Options.java
@@ -87,9 +87,10 @@ public class ImageJ2Options extends OptionsPlugin implements Interactive {
 	@Parameter(
 		label = "SciJava log level",
 		description = "<html>Log level for SciJava",
+		initializer = "initializeLogLevel",
 		callback = "setLogLevel",
 		choices = {"ERROR", "WARN", "INFO", "DEBUG", "TRACE"})
-	private String logLevel = "WARN";
+	private String logLevel;
 
 	@Parameter(label = "What is ImageJ2?", persist = false, callback = "help")
 	private Button help;
@@ -209,6 +210,11 @@ private void help() {
 		}
 	}
 
+	@SuppressWarnings("unused")
+	private void initializeLogLevel() {
+		logLevel = parseLogLevel(log.getLevel());
+	}
+
 	@SuppressWarnings("unused")
 	private void setLogLevel() {
 		log.setLevel(parseLogLevel(logLevel));
@@ -232,4 +238,27 @@ private int parseLogLevel(final String level) {
 
 		return LogService.WARN;
 	}
+
+	/**
+	 * Parses a log level from an {@code int}.
+	 * 
+	 * @param level
+	 * @return the {@code String} associated with the level
+	 */
+	private String parseLogLevel(int level) {
+		if (level == LogService.NONE)
+			return "NONE";
+		if (level == LogService.ERROR)
+			return "ERROR";
+		if (level == LogService.WARN)
+			return "WARN";
+		if (level == LogService.INFO)
+			return "INFO";
+		if (level == LogService.DEBUG)
+			return "DEBUG";
+		if (level == LogService.TRACE)
+			return "TRACE";
+
+		return "" + level;
+	}
 }
