Format code with mvn formatter:format

Author: hinerm

src/main/java/org/scijava/plugins/scripting/python/Main.java

@@ -6,13 +6,13 @@
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -26,6 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
+
 package org.scijava.plugins.scripting.python;
 
 import org.scijava.script.ScriptREPL;

src/main/java/org/scijava/plugins/scripting/python/OptionsPython.java

@@ -6,13 +6,13 @@
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -29,6 +29,13 @@
 
 package org.scijava.plugins.scripting.python;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 import org.scijava.app.AppService;
 import org.scijava.command.CommandService;
 import org.scijava.launcher.Config;
@@ -40,25 +47,15 @@
 import org.scijava.plugin.Plugin;
 import org.scijava.widget.Button;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 /**
  * Options for configuring the Python environment.
- * 
+ *
  * @author Curtis Rueden
  */
-@Plugin(type = OptionsPlugin.class, menu = {
-	@Menu(label = MenuConstants.EDIT_LABEL,
-		weight = MenuConstants.EDIT_WEIGHT,
-		mnemonic = MenuConstants.EDIT_MNEMONIC),
-	@Menu(label = "Options", mnemonic = 'o'),
-	@Menu(label = "Python...", weight = 10),
-})
+@Plugin(type = OptionsPlugin.class, menu = { @Menu(
+	label = MenuConstants.EDIT_LABEL, weight = MenuConstants.EDIT_WEIGHT,
+	mnemonic = MenuConstants.EDIT_MNEMONIC), @Menu(label = "Options",
+		mnemonic = 'o'), @Menu(label = "Python...", weight = 10), })
 public class OptionsPython extends OptionsPlugin {
 
 	@Parameter
@@ -76,7 +73,8 @@ public class OptionsPython extends OptionsPlugin {
 	@Parameter(label = "Rebuild Python environment", callback = "rebuildEnv")
 	private Button rebuildEnvironment;
 
-	@Parameter(label = "Launch in Python mode", callback = "updatePythonConfig", persist = false)
+	@Parameter(label = "Launch in Python mode", callback = "updatePythonConfig",
+		persist = false)
 	private boolean pythonMode;
 
 	// -- OptionsPython methods --
@@ -124,28 +122,31 @@ public void load() {
 		}
 
 		if (pythonDir == null) {
-			// For the default Python directory, try to match the platform string used for Java installations.
-			final String javaPlatform = System.getProperty("scijava.app.java-platform");
-			final String platform = javaPlatform != null ? javaPlatform :
-				System.getProperty("os.name") + "-" + System.getProperty("os.arch");
-			final Path pythonPath = appService.getApp().getBaseDirectory().toPath().resolve("python").resolve(platform);
+			// For the default Python directory, try to match the platform
+			// string used for Java installations.
+			final String javaPlatform = System.getProperty(
+				"scijava.app.java-platform");
+			final String platform = javaPlatform != null ? javaPlatform : System
+				.getProperty("os.name") + "-" + System.getProperty("os.arch");
+			final Path pythonPath = appService.getApp().getBaseDirectory().toPath()
+				.resolve("python").resolve(platform);
 			pythonDir = pythonPath.toFile();
 		}
 	}
 
 	public void rebuildEnv() {
 		// Use scijava.app.python-env-file system property if present.
 		final Path appPath = appService.getApp().getBaseDirectory().toPath();
-		File environmentYaml = appPath.resolve("config").resolve("environment.yml").toFile();
-		final String pythonEnvFileProp = System.getProperty("scijava.app.python-env-file");
+		File environmentYaml = appPath.resolve("config").resolve("environment.yml")
+			.toFile();
+		final String pythonEnvFileProp = System.getProperty(
+			"scijava.app.python-env-file");
 		if (pythonEnvFileProp != null) {
 			environmentYaml = OptionsPython.stringToFile(appPath, pythonEnvFileProp);
 		}
 
-		commandService.run(RebuildEnvironment.class, true,
-			"environmentYaml", environmentYaml,
-			"targetDir", pythonDir
-		);
+		commandService.run(RebuildEnvironment.class, true, "environmentYaml",
+			environmentYaml, "targetDir", pythonDir);
 	}
 
 	@Override
@@ -195,8 +196,8 @@ static File stringToFile(Path baseDir, String value) {
 	 */
 	static String fileToString(Path baseDir, File file) {
 		Path filePath = file.toPath();
-		Path relPath = filePath.startsWith(baseDir) ?
-			baseDir.relativize(filePath) : filePath.toAbsolutePath();
+		Path relPath = filePath.startsWith(baseDir) ? baseDir.relativize(filePath)
+			: filePath.toAbsolutePath();
 		return relPath.toString();
 	}
 }

src/main/java/org/scijava/plugins/scripting/python/PythonScriptEngine.java

@@ -6,13 +6,13 @@
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -61,10 +61,10 @@ public class PythonScriptEngine extends AbstractScriptEngine {
 
 	@Parameter
 	private ObjectService objectService;
-	
+
 	@Parameter
 	private LogService logService;
-	
+
 	public PythonScriptEngine(final Context context) {
 		context.inject(this);
 		setLogService(logService);
@@ -83,19 +83,21 @@ public Object eval(final String script) throws ScriptException {
 					"Python script engine, you must call scyjava.enable_scijava_scripting(context)\n" +
 					"with this script engine's associated SciJava context before using it.");
 		}
-		return pythonScriptRunner.get().apply(new Args(script, engineScopeBindings, scriptContext));
+		return pythonScriptRunner.get().apply(new Args(script, engineScopeBindings,
+			scriptContext));
 	}
 
 	@Override
 	public Object eval(Reader reader) throws ScriptException {
 		StringBuilder buf = new StringBuilder();
-		char [] cbuf = new char [65536];
+		char[] cbuf = new char[65536];
 		while (true) {
 			try {
 				int nChars = reader.read(cbuf);
 				if (nChars <= 0) break;
 				buf.append(cbuf, 0, nChars);
-			} catch (IOException e) {
+			}
+			catch (IOException e) {
 				throw new ScriptException(e);
 			}
 		}
@@ -106,8 +108,8 @@ public Object eval(Reader reader) throws ScriptException {
 	public Bindings createBindings() {
 		return new ScriptBindings();
 	}
-	
-	//Somehow just type casting did not work...
+
+	// Somehow just type casting did not work...
 	private static class ScriptBindings implements Bindings {
 
 		private Map<String, Object> bindingsMap;
@@ -178,11 +180,14 @@ public Object remove(Object key) {
 	}
 
 	private static class Args {
+
 		public final String script;
 		public final Map<String, Object> vars;
 		public final ScriptContext scriptContext;
 
-		public Args(final String script, final Map<String, Object> vars, final ScriptContext scriptContext) {
+		public Args(final String script, final Map<String, Object> vars,
+			final ScriptContext scriptContext)
+		{
 			this.script = script;
 			this.vars = vars;
 			this.scriptContext = scriptContext;

src/main/java/org/scijava/plugins/scripting/python/PythonScriptLanguage.java

@@ -6,13 +6,13 @@
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -46,7 +46,8 @@
  * @author Karl Duderstadt
  * @see ScriptEngine
  */
-@Plugin(type = ScriptLanguage.class, name = "Python (pyimagej)", priority = Priority.VERY_LOW)
+@Plugin(type = ScriptLanguage.class, name = "Python (pyimagej)",
+	priority = Priority.VERY_LOW)
 public class PythonScriptLanguage extends AbstractScriptLanguage {
 
 	@Override
@@ -63,5 +64,5 @@ public List<String> getExtensions() {
 	public ScriptEngine getScriptEngine() {
 		return new PythonScriptEngine(getContext());
 	}
-	
+
 }

src/main/java/org/scijava/plugins/scripting/python/PythonScriptSyntaxHighlighter.java

@@ -6,13 +6,13 @@
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -40,7 +40,7 @@
  */
 @Plugin(type = SyntaxHighlighter.class, name = "python-(pyimagej)")
 public class PythonScriptSyntaxHighlighter extends PythonTokenMaker implements
-SyntaxHighlighter
+	SyntaxHighlighter
 {
 	// Everything implemented in PythonTokenMaker
 }

src/main/java/org/scijava/plugins/scripting/python/RebuildEnvironment.java

@@ -6,13 +6,13 @@
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -29,6 +29,13 @@
 
 package org.scijava.plugins.scripting.python;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Comparator;
+import java.util.stream.Stream;
+
 import org.apposed.appose.Appose;
 import org.apposed.appose.Builder;
 import org.scijava.app.AppService;
@@ -38,16 +45,9 @@
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Comparator;
-import java.util.stream.Stream;
-
 /**
  * SciJava command wrapper to build a Python environment.
- * 
+ *
  * @author Curtis Rueden
  */
 @Plugin(type = Command.class, label = "Rebuild Python environment")
@@ -90,12 +90,12 @@ public void run() {
 		if (targetDir.exists()) targetDir.renameTo(backupDir);
 		// Build the new environment.
 		try {
-			Builder builder = Appose
-				.file(environmentYaml, "environment.yml")
-				.subscribeOutput(this::report)
-				.subscribeError(this::report)
-				.subscribeProgress((msg, cur, max) -> Splash.update(msg, (double) cur / max));
-			System.err.println("Building Python environment"); // HACK: stderr stream triggers console window show.
+			Builder builder = Appose.file(environmentYaml, "environment.yml")
+				.subscribeOutput(this::report).subscribeError(this::report)
+				.subscribeProgress((msg, cur, max) -> Splash.update(msg, (double) cur /
+					max));
+			System.err.println("Building Python environment");
+			// HACK: stderr stream triggers console window show.
 			Splash.show();
 			builder.build(targetDir);
 		}