Always use 'log' for LogService variable name

In the vast majority of cases, when referring to a LogService, we name
it log rather than logService. This does break the more general rule of
referring to most service instances in full lower camel case, but in the
case of the LogService, it makes the code more concise yet precise.

Author: ctrueden

src/main/java/org/scijava/command/console/RunArgument.java

@@ -57,7 +57,7 @@ public class RunArgument extends AbstractConsoleArgument {
 	private CommandService commandService;
 
 	@Parameter
-	private LogService logService;
+	private LogService log;
 
 	// -- Constructor --
 
@@ -100,12 +100,12 @@ private void run(final String commandToRun, final String optionString) {
 			return;
 
 		// TODO: parse the optionString a la ImageJ1
-		final Map<String, Object> inputMap = ConsoleUtils.parseParameterString(optionString, info, logService);
+		final Map<String, Object> inputMap = ConsoleUtils.parseParameterString(optionString, info, log);
 
 		try {
 			commandService.run(info, true, inputMap).get();
 		} catch (final Exception exc) {
-			logService.error(exc);
+			log.error(exc);
 		}
 	}
 

src/main/java/org/scijava/console/ConsoleUtils.java

@@ -64,8 +64,8 @@ public static Map<String, Object> parseParameterString(final String parameterStr
 	/**
 	 * @see #parseParameterString(String, ModuleInfo, LogService)
 	 */
-	public static Map<String, Object> parseParameterString(final String parameterString, final LogService logService) {
-		return parseParameterString(parameterString, null, logService);
+	public static Map<String, Object> parseParameterString(final String parameterString, final LogService log) {
+		return parseParameterString(parameterString, null, log);
 	}
 
 	/**
@@ -77,7 +77,7 @@ public static Map<String, Object> parseParameterString(final String parameterStr
 	 *
 	 * TODO reconcile with attribute parsing of {@link ScriptInfo}
 	 */
-	public static Map<String, Object> parseParameterString(final String parameterString, final ModuleInfo info, final LogService logService) {
+	public static Map<String, Object> parseParameterString(final String parameterString, final ModuleInfo info, final LogService log) {
 		final Map<String, Object> inputMap = new HashMap<String, Object>();
 
 		if (!parameterString.isEmpty()) {
@@ -93,8 +93,8 @@ public static Map<String, Object> parseParameterString(final String parameterStr
 				else if (inputs != null && inputs.hasNext() && split.length == 1) {
 					inputMap.put(inputs.next().getName(), split[0]);
 				}
-				else if (logService != null)
-					logService.error("Parameters must be formatted as a comma-separated list of key=value pairs");
+				else if (log != null)
+					log.error("Parameters must be formatted as a comma-separated list of key=value pairs");
 
 			}
 		}

src/main/java/org/scijava/script/ScriptLanguageIndex.java

@@ -68,10 +68,10 @@ public ScriptLanguageIndex() {
 	/**
 	 * Instantiates an index of the available script languages.
 	 * 
-	 * @param logService the log service for errors and warnings
+	 * @param log the log service for errors and warnings
 	 */
-	public ScriptLanguageIndex(final LogService logService) {
-		log = logService;
+	public ScriptLanguageIndex(final LogService log) {
+		this.log = log;
 	}
 
 	public boolean add(final ScriptEngineFactory factory, final boolean gently) {

src/main/java/org/scijava/script/console/RunScriptArgument.java

@@ -55,7 +55,7 @@ public class RunScriptArgument extends AbstractConsoleArgument {
 	private ScriptService scriptService;
 
 	@Parameter
-	private LogService logService;
+	private LogService log;
 
 	// -- Constructor --
 
@@ -100,12 +100,12 @@ private void run(final String scriptToRun, final String paramString) {
 
 		final ScriptInfo info = scriptService.getScript(script);
 
-		final Map<String, Object> inputMap = ConsoleUtils.parseParameterString(paramString, info, logService);
+		final Map<String, Object> inputMap = ConsoleUtils.parseParameterString(paramString, info, log);
 
 		try {
 			scriptService.run(info, true, inputMap).get();
 		} catch (final Exception exc) {
-			logService.error(exc);
+			log.error(exc);
 		}
 	}