Clean up style

Author: ctrueden

src/main/java/org/scijava/plugins/scripting/jython/DefaultJythonService.java

@@ -8,13 +8,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
@@ -28,6 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
+
 package org.scijava.plugins.scripting.jython;
 
 import javax.script.ScriptEngine;
@@ -46,7 +47,9 @@
  * @author Mark Hiner hinerm at gmail.com
  */
 @Plugin(type = Service.class)
-public class DefaultJythonService extends AbstractService implements JythonService {
+public class DefaultJythonService extends AbstractService implements
+	JythonService
+{
 
 	// -- Fields --
 

src/main/java/org/scijava/plugins/scripting/jython/JythonBindings.java

@@ -8,13 +8,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
@@ -48,7 +48,7 @@
 
 /**
  * A {@link Bindings} wrapper around Jython's local variables.
- * 
+ *
  * @author Johannes Schindelin
  */
 public class JythonBindings implements Bindings {
@@ -71,8 +71,7 @@ public class JythonBindings implements Bindings {
 	 * PythonInterpreter, as the ScriptModule has a hard
 	 * reference to its ScriptEngine.
 	 */
-	private Map<String, WeakReference<Object>> shallowMap =
-		new HashMap<String, WeakReference<Object>>();
+	private final Map<String, WeakReference<Object>> shallowMap = new HashMap<>();
 
 	public JythonBindings(final PythonInterpreter interpreter) {
 		this.interpreter = interpreter;
@@ -89,43 +88,44 @@ public boolean isEmpty() {
 	}
 
 	@Override
-	public boolean containsKey(Object key) {
+	public boolean containsKey(final Object key) {
 		return get(key) != null;
 	}
 
 	@Override
-	public boolean containsValue(Object value) {
+	public boolean containsValue(final Object value) {
 		for (final Object value2 : values()) {
 			if (value.equals(value2)) return true;
 		}
 		return false;
 	}
 
 	@Override
-	public Object get(Object key) {
+	public Object get(final Object key) {
 		if (shallowMap.containsKey(key)) {
 			return shallowMap.get(key).get();
 		}
 
 		try {
-			return interpreter.get((String)key);
-		} catch (Error e) {
+			return interpreter.get((String) key);
+		}
+		catch (final Error e) {
 			return null;
 		}
 	}
 
 	@Override
-	public Object put(String key, Object value) {
+	public Object put(final String key, final Object value) {
 		final Object result = get(key);
 
-		if (value instanceof ScriptModule || value instanceof JythonScriptEngine){
-			shallowMap.put(key, new WeakReference<Object>(value));
+		if (value instanceof ScriptModule || value instanceof JythonScriptEngine) {
+			shallowMap.put(key, new WeakReference<>(value));
 		}
 		else {
 			try {
 				interpreter.set(key, value);
 			}
-			catch (Error e) {
+			catch (final Error e) {
 				// ignore
 			}
 		}
@@ -134,23 +134,25 @@ public Object put(String key, Object value) {
 	}
 
 	@Override
-	public Object remove(Object key) {
+	public Object remove(final Object key) {
 		final Object result = get(key);
 		if (shallowMap.containsKey(key)) shallowMap.remove(key);
-		else if (result != null) interpreter.getLocals().__delitem__((String)key);
+		else if (result != null) interpreter.getLocals().__delitem__((String) key);
 
 		return result;
 	}
 
 	@Override
-	public void putAll(Map<? extends String, ? extends Object> toMerge) {
-		for (final Entry<? extends String, ? extends Object> entry : toMerge.entrySet()) {
+	public void putAll(final Map<? extends String, ? extends Object> toMerge) {
+		for (final Entry<? extends String, ? extends Object> entry : toMerge
+			.entrySet())
+		{
 			put(entry.getKey(), entry.getValue());
 		}
 	}
 
 	private PyStringMap dict() {
-		return (PyStringMap)interpreter.getLocals();
+		return (PyStringMap) interpreter.getLocals();
 	}
 
 	@Override
@@ -160,7 +162,7 @@ public void clear() {
 
 	@Override
 	public Set<String> keySet() {
-		final Set<String> result = new HashSet<String>();
+		final Set<String> result = new HashSet<>();
 		for (final Object name : dict().keys()) {
 			result.add(name.toString());
 		}
@@ -169,18 +171,21 @@ public Set<String> keySet() {
 
 	@Override
 	public Collection<Object> values() {
-		final List<Object> result = new ArrayList<Object>();
-		for (final Object name : dict().keys()) try {
-			result.add(get(name));
-		} catch (Error exc) {
-			// ignore for now
+		final List<Object> result = new ArrayList<>();
+		for (final Object name : dict().keys()) {
+			try {
+				result.add(get(name));
+			}
+			catch (final Error exc) {
+				// ignore for now
+			}
 		}
 		return result;
 	}
 
 	@Override
 	public Set<Entry<String, Object>> entrySet() {
-		final Set<Entry<String, Object>> result = new HashSet<Entry<String, Object>>();
+		final Set<Entry<String, Object>> result = new HashSet<>();
 		for (final Object name : dict().keys()) {
 			result.add(new Entry<String, Object>() {
 
@@ -195,7 +200,7 @@ public Object getValue() {
 				}
 
 				@Override
-				public Object setValue(Object value) {
+				public Object setValue(final Object value) {
 					throw new UnsupportedOperationException();
 				}
 			});

src/main/java/org/scijava/plugins/scripting/jython/JythonReferenceCleaner.java

@@ -8,13 +8,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
@@ -45,7 +45,7 @@
 /**
  * A helper class for purging dangling references within a Jython interpreter
  * after it executes a script.
- * 
+ *
  * @author Mark Hiner
  */
 public class JythonReferenceCleaner {
@@ -55,9 +55,9 @@ public class JythonReferenceCleaner {
 	// See http://resources.ej-technologies.com/jprofiler/help/doc/index.html
 
 	private final LinkedList<JythonEnginePhantomReference> phantomReferences =
-		new LinkedList<JythonEnginePhantomReference>();
+		new LinkedList<>();
 	private final ReferenceQueue<JythonScriptEngine> queue =
-		new ReferenceQueue<JythonScriptEngine>();
+		new ReferenceQueue<>();
 
 	private boolean shutDown = false;
 
@@ -146,7 +146,7 @@ public JythonEnginePhantomReference(final JythonScriptEngine engine,
 		}
 
 		public void cleanup() {
-			final List<String> scriptLocals = new ArrayList<String>();
+			final List<String> scriptLocals = new ArrayList<>();
 			final PythonInterpreter interp = interpreter;
 			if (interp == null) return;
 

src/main/java/org/scijava/plugins/scripting/jython/JythonScriptEngine.java

@@ -8,13 +8,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
@@ -44,11 +44,10 @@
 
 /**
  * A Python interpreter based on Jython.
- * 
+ *
  * @author Johannes Schindelin
  */
-public class JythonScriptEngine extends AbstractScriptEngine
-{
+public class JythonScriptEngine extends AbstractScriptEngine {
 
 	protected final PythonInterpreter interpreter;
 
@@ -73,7 +72,8 @@ public Object eval(final Reader reader) throws ScriptException {
 		setup();
 		try {
 			final String filename = getString(ScriptEngine.FILENAME);
-			return Py.runCode(interpreter.compile(reader, filename), null, interpreter.getLocals());
+			return Py.runCode(interpreter.compile(reader, filename), null, interpreter
+				.getLocals());
 		}
 		catch (final Exception e) {
 			throw new ScriptException(e);
@@ -97,7 +97,7 @@ protected void setup() {
 	}
 
 	private String getString(final String key) {
-		Object result = get(key);
+		final Object result = get(key);
 		return result == null ? null : result.toString();
 	}
 }

src/main/java/org/scijava/plugins/scripting/jython/JythonScriptLanguage.java

@@ -8,13 +8,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
@@ -47,7 +47,7 @@
 
 /**
  * An adapter of the Jython interpreter to the SciJava scripting interface.
- * 
+ *
  * @author Johannes Schindelin
  * @author Mark Hiner <hinerm@gmail.com>
  * @see ScriptEngine
@@ -65,9 +65,9 @@ public JythonScriptLanguage() {
 	@Override
 	public ScriptEngine getScriptEngine() {
 		// NB: recursive priorities can only be resolved via inter-service
-		//     dependencies. There is no way to make the ScriptService
-		//     depend on the JythonService because of the hierarchy
-		//     of components. So we have to get the JythonService indirectly.
+		// dependencies. There is no way to make the ScriptService
+		// depend on the JythonService because of the hierarchy
+		// of components. So we have to get the JythonService indirectly.
 		return context.service(JythonService.class).getScriptEngine();
 	}
 

src/main/java/org/scijava/plugins/scripting/jython/JythonService.java

@@ -8,13 +8,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
@@ -28,6 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
+
 package org.scijava.plugins.scripting.jython;
 
 import javax.script.ScriptEngine;

src/test/java/org/scijava/plugins/scripting/jython/JythonTest.java

@@ -8,13 +8,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
@@ -51,7 +51,7 @@
 
 /**
  * Jython unit tests.
- * 
+ *
  * @author Johannes Schindelin
  */
 public class JythonTest {
@@ -100,7 +100,7 @@ public void testParameters() throws InterruptedException, ExecutionException,
 		final ScriptModule m = scriptService.run("hello.py", script, true).get();
 
 		final Object actual = m.getOutput("language");
-		final String expected =
+		final String expected = //
 			scriptService.getLanguageByName("jython").getLanguageName();
 		assertEquals(expected, actual);
 	}