AbstractLogService: migrate log level extraction to LogLevel class

Author: ctrueden

src/main/java/org/scijava/log/AbstractLogService.java

@@ -75,7 +75,7 @@ public AbstractLogService() {
 
 		// global log level property
 		final String logProp = System.getProperty(LOG_LEVEL_PROPERTY);
-		final int level = level(logProp);
+		final int level = LogLevel.value(logProp);
 		if (level >= 0) setLevel(level);
 
 		if (getLevel() == 0)
@@ -90,7 +90,7 @@ public AbstractLogService() {
 			if (!propName.startsWith(logLevelPrefix)) continue;
 			final String classOrPackageName =
 				propName.substring(logLevelPrefix.length());
-			setLevel(classOrPackageName, level(props.getProperty(propName)));
+			setLevel(classOrPackageName, LogLevel.value(props.getProperty(propName)));
 		}
 
 	}
@@ -248,29 +248,6 @@ protected String getPrefix(final int level) {
 
 	// -- Helper methods --
 
-	/** Extracts the log level value from a string. */
-	private int level(final String logProp) {
-		if (logProp == null) return -1;
-
-		// check whether it's a string label (e.g., "debug")
-		final String log = logProp.trim().toLowerCase();
-		if (log.startsWith("n")) return NONE;
-		if (log.startsWith("e")) return ERROR;
-		if (log.startsWith("w")) return WARN;
-		if (log.startsWith("i")) return INFO;
-		if (log.startsWith("d")) return DEBUG;
-		if (log.startsWith("t")) return TRACE;
-
-		// check whether it's a numerical value (e.g., 5)
-		try {
-			return Integer.parseInt(log);
-		}
-		catch (final NumberFormatException exc) {
-			// nope!
-		}
-		return -1;
-	}
-
 	private String callingClass() {
 		final String thisClass = AbstractLogService.class.getName();
 		for (final StackTraceElement element : new Exception().getStackTrace()) {

src/main/java/org/scijava/log/LogLevel.java

@@ -65,4 +65,32 @@ public static String prefix(final int level) {
 				return "LEVEL" + level;
 		}
 	}
+
+	/**
+	 * Extracts the log level value from a string.
+	 * 
+	 * @return The log level, or -1 if the level cannot be parsed.
+	 */
+	public static int value(final String s) {
+		if (s == null) return -1;
+
+		// check whether it's a string label (e.g., "debug")
+		final String log = s.trim().toLowerCase();
+		if (log.startsWith("n")) return LogLevel.NONE;
+		if (log.startsWith("e")) return LogLevel.ERROR;
+		if (log.startsWith("w")) return LogLevel.WARN;
+		if (log.startsWith("i")) return LogLevel.INFO;
+		if (log.startsWith("d")) return LogLevel.DEBUG;
+		if (log.startsWith("t")) return LogLevel.TRACE;
+
+		// check whether it's a numerical value (e.g., 5)
+		try {
+			return Integer.parseInt(log);
+		}
+		catch (final NumberFormatException exc) {
+			// nope!
+		}
+		return -1;
+	}
+
 }